Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:31:02 JST 2012
Kouhei Sutou 2011-10-27 18:55:54 +0900 (Thu, 27 Oct 2011) New Revision: 54dac7d1dedbdc7f140790ace3f0d81f398078d2 https://github.com/mroonga/mroonga/commit/54dac7d1dedbdc7f140790ace3f0d81f398078d2 Log: [mariadb] close() is protected. Modified files: ha_mroonga.h Modified: ha_mroonga.h (+6 -1) =================================================================== --- ha_mroonga.h 2011-10-27 18:42:53 +0900 (32c445c) +++ ha_mroonga.h 2011-10-27 18:55:54 +0900 (c809a86) @@ -32,6 +32,10 @@ extern "C" { #include <groonga.h> #include "mrn_sys.h" +#ifdef MARIADB_BASE_VERSION +# define MRN_MARIADB_P 1 +#endif + #if (MYSQL_VERSION_ID >= 50603) || \ (MYSQL_VERSION_ID >= 50513 && MYSQL_VERSION_ID < 50600) || \ (MYSQL_VERSION_ID >= 50158 && MYSQL_VERSION_ID < 50500) @@ -43,7 +47,8 @@ extern "C" { # define MRN_HANDLER_HAVE_ADD_INDEX 1 #endif -#if MYSQL_VERSION_ID >= 50600 +#if (MYSQL_VERSION_ID >= 50600) || \ + (defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 50302) # define MRN_HANDLER_HAVE_HA_CLOSE 1 # define MRN_HANDLER_HAVE_HA_RND_NEXT 1 # define MRN_HANDLER_HAVE_HA_RND_POS 1 -------------- next part -------------- HTML����������������������������...Download