diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-12 12:16:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-12 12:16:40 +0300 |
| commit | 60c04be6599597548ad07ce11e1d7d4004a7cc9c (patch) | |
| tree | 491f1b7b65b82ed270e5af34db4d4cebf760e501 /sql/handler.h | |
| parent | ebddd8699c02519f99a313182b96ae1c04a67a63 (diff) | |
| parent | 9554ef067878c4650ef4b9ad44e0b222cdb313a5 (diff) | |
| download | mariadb-git-60c04be6599597548ad07ce11e1d7d4004a7cc9c.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sql/handler.h b/sql/handler.h index 5e5c0ffc001..46de5e5f017 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -2163,18 +2163,22 @@ struct Table_scope_and_contents_source_st: } bool fix_create_fields(THD *thd, Alter_info *alter_info, - const TABLE_LIST &create_table, - bool create_select= false); + const TABLE_LIST &create_table); bool fix_period_fields(THD *thd, Alter_info *alter_info); - bool check_fields(THD *thd, Alter_info *alter_info, TABLE_LIST &create_table); + bool check_fields(THD *thd, Alter_info *alter_info, + const Lex_table_name &table_name, + const Lex_table_name &db, + int select_count= 0); bool check_period_fields(THD *thd, Alter_info *alter_info); bool vers_fix_system_fields(THD *thd, Alter_info *alter_info, - const TABLE_LIST &create_table, - bool create_select= false); + const TABLE_LIST &create_table); bool vers_check_system_fields(THD *thd, Alter_info *alter_info, - const TABLE_LIST &create_table); + const Lex_table_name &table_name, + const Lex_table_name &db, + int select_count= 0); + }; |