Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:33:04 JST 2012
Kouhei Sutou 2011-11-28 14:45:40 +0900 (Mon, 28 Nov 2011) New Revision: 442ca190eac236cae26191f3564c167b7db5ca0f https://github.com/mroonga/mroonga/commit/442ca190eac236cae26191f3564c167b7db5ca0f Log: [mysql55] support flags of st_mysql_plugin. Modified files: ha_mroonga.cc mrn_mysql_compat.h Modified: ha_mroonga.cc (+9 -1) =================================================================== --- ha_mroonga.cc 2011-11-28 14:32:28 +0900 (d03f670) +++ ha_mroonga.cc 2011-11-28 14:45:40 +0900 (d57c6e5) @@ -435,7 +435,11 @@ struct st_mysql_plugin i_s_mrn_stats = MRN_VERSION_IN_HEX, NULL, NULL, - NULL, + NULL +#ifdef MRN_PLUGIN_HAVE_FLAGS + , + 0 +#endif }; /* End of mroonga information schema implementations */ @@ -1064,6 +1068,10 @@ mysql_declare_plugin(mroonga) mrn_status_variables, mrn_system_variables, NULL +#ifdef MRN_PLUGIN_HAVE_FLAGS + , + 0 +#endif }, i_s_mrn_stats mysql_declare_plugin_end; Modified: mrn_mysql_compat.h (+4 -0) =================================================================== --- mrn_mysql_compat.h 2011-11-28 14:32:28 +0900 (a5b386f) +++ mrn_mysql_compat.h 2011-11-28 14:45:40 +0900 (d652109) @@ -48,6 +48,10 @@ typedef MYSQL_ERROR Sql_condition; #endif +#if MYSQL_VERSION_ID >= 50516 && MYSQL_VERSION_ID < 50603 +# define MRN_PLUGIN_HAVE_FLAGS 1 +#endif + #ifndef MRN_MARIADB_P typedef char *range_id_t; #endif -------------- next part -------------- HTML����������������������������...Download