diff --git a/sql/handler.h b/sql/handler.h index acd1375cfbb..abcd91c1dd8 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -4431,7 +4431,7 @@ public: @return The handler error code or zero for success. */ virtual int - get_foreign_key_list(THD *thd, List *f_key_list) + get_foreign_key_list(const THD *thd, List *f_key_list) { return 0; } /** Get the list of foreign keys referencing this table. @@ -4445,7 +4445,7 @@ public: @return The handler error code or zero for success. */ virtual int - get_parent_foreign_key_list(THD *thd, List *f_key_list) + get_parent_foreign_key_list(const THD *thd, List *f_key_list) { return 0; } virtual uint referenced_by_foreign_key() { return 0;} virtual void init_table_handle_for_HANDLER() diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 2324eeb7b4a..b21019d90a6 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -15365,7 +15365,7 @@ static FOREIGN_KEY_INFO* get_foreign_key_info( /*=================*/ - THD* thd, /*!< in: user thread handle */ + const THD* thd, /*!< in: user thread handle */ dict_foreign_t* foreign)/*!< in: foreign key constraint */ { FOREIGN_KEY_INFO f_key_info; @@ -15501,7 +15501,7 @@ Gets the list of foreign keys in this table. int ha_innobase::get_foreign_key_list( /*==============================*/ - THD* thd, /*!< in: user thread handle */ + const THD* thd, /*!< in: user thread handle */ List* f_key_list) /*!< out: foreign key list */ { update_thd(ha_thd()); @@ -15539,7 +15539,7 @@ Gets the set of foreign keys where this table is the referenced table. int ha_innobase::get_parent_foreign_key_list( /*=====================================*/ - THD* thd, /*!< in: user thread handle */ + const THD* thd, /*!< in: user thread handle */ List* f_key_list) /*!< out: foreign key list */ { update_thd(ha_thd()); diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h index cef3e5f8e66..914f363720a 100644 --- a/storage/innobase/handler/ha_innodb.h +++ b/storage/innobase/handler/ha_innodb.h @@ -213,11 +213,11 @@ public: char* get_foreign_key_create_info() override; - int get_foreign_key_list(THD *thd, + int get_foreign_key_list(const THD *thd, List *f_key_list) override; int get_parent_foreign_key_list( - THD* thd, + const THD* thd, List* f_key_list) override; bool can_switch_engines() override; diff --git a/storage/mroonga/ha_mroonga.cpp b/storage/mroonga/ha_mroonga.cpp index 85d6473ded3..f57fc385ae3 100644 --- a/storage/mroonga/ha_mroonga.cpp +++ b/storage/mroonga/ha_mroonga.cpp @@ -16676,7 +16676,7 @@ bool ha_mroonga::can_switch_engines() DBUG_RETURN(res); } -int ha_mroonga::wrapper_get_foreign_key_list(THD *thd, +int ha_mroonga::wrapper_get_foreign_key_list(const THD *thd, List *f_key_list) { MRN_DBUG_ENTER_METHOD(); @@ -16690,7 +16690,7 @@ int ha_mroonga::wrapper_get_foreign_key_list(THD *thd, } #ifdef MRN_SUPPORT_FOREIGN_KEYS -int ha_mroonga::storage_get_foreign_key_list(THD *thd, +int ha_mroonga::storage_get_foreign_key_list(const THD *thd, List *f_key_list) { int error; @@ -16800,7 +16800,7 @@ int ha_mroonga::storage_get_foreign_key_list(THD *thd, } #endif -int ha_mroonga::get_foreign_key_list(THD *thd, +int ha_mroonga::get_foreign_key_list(const THD *thd, List *f_key_list) { MRN_DBUG_ENTER_METHOD(); @@ -16814,7 +16814,7 @@ int ha_mroonga::get_foreign_key_list(THD *thd, DBUG_RETURN(res); } -int ha_mroonga::wrapper_get_parent_foreign_key_list(THD *thd, +int ha_mroonga::wrapper_get_parent_foreign_key_list(const THD *thd, List *f_key_list) { MRN_DBUG_ENTER_METHOD(); @@ -16827,7 +16827,7 @@ int ha_mroonga::wrapper_get_parent_foreign_key_list(THD *thd, DBUG_RETURN(res); } -int ha_mroonga::storage_get_parent_foreign_key_list(THD *thd, +int ha_mroonga::storage_get_parent_foreign_key_list(const THD *thd, List *f_key_list) { MRN_DBUG_ENTER_METHOD(); @@ -16835,7 +16835,7 @@ int ha_mroonga::storage_get_parent_foreign_key_list(THD *thd, DBUG_RETURN(res); } -int ha_mroonga::get_parent_foreign_key_list(THD *thd, +int ha_mroonga::get_parent_foreign_key_list(const THD *thd, List *f_key_list) { MRN_DBUG_ENTER_METHOD(); diff --git a/storage/mroonga/ha_mroonga.hpp b/storage/mroonga/ha_mroonga.hpp index 27219ffd158..52fd0ef9a0e 100644 --- a/storage/mroonga/ha_mroonga.hpp +++ b/storage/mroonga/ha_mroonga.hpp @@ -621,8 +621,8 @@ protected: char *get_tablespace_name(THD *thd, char *name, uint name_len); #endif bool can_switch_engines() mrn_override; - int get_foreign_key_list(THD *thd, List *f_key_list) mrn_override; - int get_parent_foreign_key_list(THD *thd, List *f_key_list) mrn_override; + int get_foreign_key_list(const THD *thd, List *f_key_list) mrn_override; + int get_parent_foreign_key_list(const THD *thd, List *f_key_list) mrn_override; uint referenced_by_foreign_key() mrn_override; void init_table_handle_for_HANDLER() mrn_override; void free_foreign_key_create_info(char* str) mrn_override; @@ -1273,10 +1273,10 @@ private: #endif bool wrapper_can_switch_engines(); bool storage_can_switch_engines(); - int wrapper_get_foreign_key_list(THD *thd, List *f_key_list); - int storage_get_foreign_key_list(THD *thd, List *f_key_list); - int wrapper_get_parent_foreign_key_list(THD *thd, List *f_key_list); - int storage_get_parent_foreign_key_list(THD *thd, List *f_key_list); + int wrapper_get_foreign_key_list(const THD *thd, List *f_key_list); + int storage_get_foreign_key_list(const THD *thd, List *f_key_list); + int wrapper_get_parent_foreign_key_list(const THD *thd, List *f_key_list); + int storage_get_parent_foreign_key_list(const THD *thd, List *f_key_list); uint wrapper_referenced_by_foreign_key(); uint storage_referenced_by_foreign_key(); void wrapper_init_table_handle_for_HANDLER();