[mysql55] support flags of st_mysql_plugin.

mroonga · Nov 28, 2011 · 442ca19 · 442ca19
1 parent cbc4ca0
commit 442ca19
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/ha_mroonga.cc b/ha_mroonga.cc
@@ -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;
 

diff --git a/mrn_mysql_compat.h b/mrn_mysql_compat.h
@@ -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