database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2019-09-12 16:36:46 +03:00
parent 9d26f3dabb 60c04be659
commit d28686ada6
55 changed files with 1014 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/handler.h
View File

@ -2168,18 +2168,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);
};