mysql57: follow handlerton::flush_logs API change

mroonga · Mar 14, 2015 · 767675f · 767675f
1 parent ae5f62a
commit 767675f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
@@ -1145,7 +1145,11 @@ static int mrn_close_connection(handlerton *hton, THD *thd)
   DBUG_RETURN(0);
 }
 
+#ifdef MRN_FLUSH_LOGS_HAVE_BINLOG_GROUP_FLUSH
+static bool mrn_flush_logs(handlerton *hton, bool binlog_group_flush)
+#else
 static bool mrn_flush_logs(handlerton *hton)
+#endif
 {
   MRN_DBUG_ENTER_FUNCTION();
   bool result = 0;

diff --git a/ha_mroonga.hpp b/ha_mroonga.hpp
@@ -205,6 +205,10 @@ extern "C" {
 #  define MRN_SUPPORT_PARTITION
 #endif
 
+#if MYSQL_VERSION_ID >= 50706 && !defined(MRN_MARIADB_P)
+#  define MRN_FLUSH_LOGS_HAVE_BINLOG_GROUP_FLUSH
+#endif
+
 class ha_mroonga;
 
 /* structs */