Kouhei Sutou
null+****@clear*****
Tue Mar 17 21:40:32 JST 2015
Kouhei Sutou 2015-03-17 21:40:32 +0900 (Tue, 17 Mar 2015) New Revision: 505b31f4c4844b87d4e0ff85f730862c6a476e5c https://github.com/mroonga/mroonga/commit/505b31f4c4844b87d4e0ff85f730862c6a476e5c Message: mysql57: follow handler::is_fatal_error() API change Modified files: ha_mroonga.cpp ha_mroonga.hpp Modified: ha_mroonga.cpp (+8 -0) =================================================================== --- ha_mroonga.cpp 2015-03-17 21:36:02 +0900 (440d045) +++ ha_mroonga.cpp 2015-03-17 21:40:32 +0900 (b3964c9) @@ -13234,7 +13234,11 @@ bool ha_mroonga::wrapper_is_fatal_error(int error_num, uint flags) MRN_DBUG_ENTER_METHOD(); MRN_SET_WRAP_SHARE_KEY(share, table->s); MRN_SET_WRAP_TABLE_KEY(this, table); +#ifdef MRN_HANDLER_IS_FATAL_ERROR_HAVE_FLAGS res = wrap_handler->is_fatal_error(error_num, flags); +#else + res = wrap_handler->is_fatal_error(error_num); +#endif MRN_SET_BASE_SHARE_KEY(share, table->s); MRN_SET_BASE_TABLE_KEY(this, table); DBUG_RETURN(res); @@ -13243,7 +13247,11 @@ bool ha_mroonga::wrapper_is_fatal_error(int error_num, uint flags) bool ha_mroonga::storage_is_fatal_error(int error_num, uint flags) { MRN_DBUG_ENTER_METHOD(); +#ifdef MRN_HANDLER_IS_FATAL_ERROR_HAVE_FLAGS bool is_fatal_error = handler::is_fatal_error(error_num, flags); +#else + bool is_fatal_error = handler::is_fatal_error(error_num); +#endif DBUG_RETURN(is_fatal_error); } Modified: ha_mroonga.hpp (+6 -1) =================================================================== --- ha_mroonga.hpp 2015-03-17 21:36:02 +0900 (f054685) +++ ha_mroonga.hpp 2015-03-17 21:40:32 +0900 (6442df4) @@ -223,6 +223,11 @@ extern "C" { # define MRN_FOREIGN_KEY_USE_CONST_STRING #endif +#if MYSQL_VERSION_ID < 50706 || defined(MRN_MARIADB_P) +# define MRN_HANDLER_IS_FATAL_ERROR_HAVE_FLAGS +#endif + + class ha_mroonga; /* structs */ @@ -492,7 +497,7 @@ public: bool check_and_repair(THD *thd); int analyze(THD* thd, HA_CHECK_OPT* check_opt); int optimize(THD* thd, HA_CHECK_OPT* check_opt); - bool is_fatal_error(int error_num, uint flags); + bool is_fatal_error(int error_num, uint flags=0); bool check_if_incompatible_data(HA_CREATE_INFO *create_info, uint table_changes); #ifdef MRN_HANDLER_HAVE_CHECK_IF_SUPPORTED_INPLACE_ALTER -------------- next part -------------- HTML����������������������������...Download
