Kouhei Sutou
null+****@clear*****
Tue Mar 17 21:49:21 JST 2015
Kouhei Sutou 2015-03-17 21:49:21 +0900 (Tue, 17 Mar 2015) New Revision: b287c9b47f79185eb465664f09db233cab9cc380 https://github.com/mroonga/mroonga/commit/b287c9b47f79185eb465664f09db233cab9cc380 Message: mysql57: remove removed handler::reset_auto_increment() support Modified files: ha_mroonga.cpp ha_mroonga.hpp Modified: ha_mroonga.cpp (+2 -0) =================================================================== --- ha_mroonga.cpp 2015-03-17 21:46:22 +0900 (804f808) +++ ha_mroonga.cpp 2015-03-17 21:49:21 +0900 (34184cb) @@ -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() { Modified: ha_mroonga.hpp (+7 -0) =================================================================== --- ha_mroonga.hpp 2015-03-17 21:46:22 +0900 (6442df4) +++ ha_mroonga.hpp 2015-03-17 21:49:21 +0900 (a2629a5) @@ -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 @@ public: 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 @@ private: 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); -------------- next part -------------- HTML����������������������������...Download