Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:58:36 JST 2012
Kouhei Sutou 2012-02-24 19:21:30 +0900 (Fri, 24 Feb 2012) New Revision: ff6533b8cff792449365d280fd4d923d6dfe1f7e https://github.com/mroonga/mroonga/commit/ff6533b8cff792449365d280fd4d923d6dfe1f7e Log: mysql51: make buildable again. refs #1195 Reported by Kazuhiko Shiozaki. Thanks!!! Modified files: ha_mroonga.cc ha_mroonga.h Modified: ha_mroonga.cc (+2 -0) =================================================================== --- ha_mroonga.cc 2012-02-24 17:36:57 +0900 (d1e0cb0) +++ ha_mroonga.cc 2012-02-24 19:21:30 +0900 (1ef751a) @@ -11430,6 +11430,7 @@ 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) { @@ -11464,6 +11465,7 @@ 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.h (+5 -0) =================================================================== --- ha_mroonga.h 2012-02-24 17:36:57 +0900 (2e842f5) +++ ha_mroonga.h 2012-02-24 19:21:30 +0900 (a0b06ee) @@ -73,6 +73,7 @@ extern "C" { #if MYSQL_VERSION_ID >= 50500 # define MRN_HANDLER_HAVE_TRUNCATE +# define MRN_HANDLER_HAVE_GET_PARENT_FOREIGN_KEY_LIST #endif #if MYSQL_VERSION_ID >= 50500 @@ -409,7 +410,9 @@ protected: char *get_tablespace_name(THD *thd, char *name, uint name_len); 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); @@ -865,8 +868,10 @@ 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