mysql57: remove removed handler::reset_auto_increment() support

mroonga · Mar 17, 2015 · b287c9b · b287c9b
1 parent 3527264
commit b287c9b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
@@ -14994,6 +14994,7 @@ int ha_mroonga::check_for_upgrade(HA_CHECK_OPT *check_opt)
   DBUG_RETURN(error);
 }
 
+#ifdef MRN_HANDLER_HAVE_RESET_AUTO_INCREMENT
 int ha_mroonga::wrapper_reset_auto_increment(ulonglong value)
 {
   int res;
@@ -15030,6 +15031,7 @@ int ha_mroonga::reset_auto_increment(ulonglong value)
   }
   DBUG_RETURN(res);
 }
+#endif
 
 void ha_mroonga::set_pk_bitmap()
 {

diff --git a/ha_mroonga.hpp b/ha_mroonga.hpp
@@ -227,6 +227,9 @@ extern "C" {
 #  define MRN_HANDLER_IS_FATAL_ERROR_HAVE_FLAGS
 #endif
 
+#if MYSQL_VERSION_ID < 50706 || defined(MRN_MARIADB_P)
+#  define MRN_HANDLER_HAVE_RESET_AUTO_INCREMENT
+#endif
 
 class ha_mroonga;
 
@@ -523,7 +526,9 @@ class ha_mroonga: public handler
   void restore_auto_increment(ulonglong prev_insert_id);
   void release_auto_increment();
   int check_for_upgrade(HA_CHECK_OPT *check_opt);
+#ifdef MRN_HANDLER_HAVE_RESET_AUTO_INCREMENT
   int reset_auto_increment(ulonglong value);
+#endif
   bool was_semi_consistent_read();
   void try_semi_consistent_read(bool yes);
   void unlock_row();
@@ -1181,8 +1186,10 @@ class ha_mroonga: public handler
   void storage_release_auto_increment();
   int wrapper_check_for_upgrade(HA_CHECK_OPT *check_opt);
   int storage_check_for_upgrade(HA_CHECK_OPT *check_opt);
+#ifdef MRN_HANDLER_HAVE_RESET_AUTO_INCREMENT
   int wrapper_reset_auto_increment(ulonglong value);
   int storage_reset_auto_increment(ulonglong value);
+#endif
   bool wrapper_was_semi_consistent_read();
   bool storage_was_semi_consistent_read();
   void wrapper_try_semi_consistent_read(bool yes);