Kouhei Sutou
null+****@clear*****
Sun Jun 21 23:09:27 JST 2015
Kouhei Sutou 2015-06-21 23:09:27 +0900 (Sun, 21 Jun 2015) New Revision: 0e5f286275ad3560b4a0754fb313b2c12e170e5a https://github.com/mroonga/mroonga/commit/0e5f286275ad3560b4a0754fb313b2c12e170e5a Message: Remove needless check for old MySQL Modified files: ha_mroonga.cpp ha_mroonga.hpp Modified: ha_mroonga.cpp (+0 -2) =================================================================== --- ha_mroonga.cpp 2015-06-21 23:08:21 +0900 (3991e64) +++ ha_mroonga.cpp 2015-06-21 23:09:27 +0900 (2ffd8b7) @@ -16227,7 +16227,6 @@ int ha_mroonga::get_foreign_key_list(THD *thd, DBUG_RETURN(res); } -#ifdef MRN_HANDLER_HAVE_GET_PARENT_FOREIGN_KEY_LIST int ha_mroonga::wrapper_get_parent_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list) { @@ -16262,7 +16261,6 @@ int ha_mroonga::get_parent_foreign_key_list(THD *thd, } DBUG_RETURN(res); } -#endif uint ha_mroonga::wrapper_referenced_by_foreign_key() { Modified: ha_mroonga.hpp (+0 -8) =================================================================== --- ha_mroonga.hpp 2015-06-21 23:08:21 +0900 (01e50b9) +++ ha_mroonga.hpp 2015-06-21 23:09:27 +0900 (b6411d6) @@ -73,10 +73,6 @@ extern "C" { # define MRN_HANDLER_HAVE_MULTI_RANGE_READ_INFO_KEY_PARTS #endif -#if MYSQL_VERSION_ID >= 50500 -# define MRN_HANDLER_HAVE_GET_PARENT_FOREIGN_KEY_LIST -#endif - #if MYSQL_VERSION_ID < 50600 # define MRN_HANDLER_HAVE_GET_TABLESPACE_NAME #endif @@ -571,9 +567,7 @@ protected: #endif bool can_switch_engines(); int get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list); -#ifdef MRN_HANDLER_HAVE_GET_PARENT_FOREIGN_KEY_LIST int get_parent_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list); -#endif uint referenced_by_foreign_key(); void init_table_handle_for_HANDLER(); void free_foreign_key_create_info(char* str); @@ -1221,10 +1215,8 @@ private: bool storage_can_switch_engines(); int wrapper_get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list); int storage_get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list); -#ifdef MRN_HANDLER_HAVE_GET_PARENT_FOREIGN_KEY_LIST int wrapper_get_parent_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list); int storage_get_parent_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list); -#endif uint wrapper_referenced_by_foreign_key(); uint storage_referenced_by_foreign_key(); void wrapper_init_table_handle_for_HANDLER(); -------------- next part -------------- HTML����������������������������...Download