1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup: reformat

Browse Source
This commit is contained in:
Sergei Golubchik 2019-02-13 18:02:02 +01:00
parent c0745e3730
commit 84cbd69c9e
2 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_insert.cc
View File

@ -4147,10 +4147,8 @@ Field *Item::create_field_for_create_select(TABLE *table)
@retval 0 Error @retval 0 Error
*/ */
TABLE *select_create::create_table_from_items(THD *thd, TABLE *select_create::create_table_from_items(THD *thd, List<Item> *items,
List<Item> *items, MYSQL_LOCK **lock, TABLEOP_HOOKS *hooks)
MYSQL_LOCK **lock,
TABLEOP_HOOKS *hooks)
{ {
TABLE tmp_table; // Used during 'Create_field()' TABLE tmp_table; // Used during 'Create_field()'
TABLE_SHARE share; TABLE_SHARE share;

32
sql/sql_table.cc
View File

@ -4438,12 +4438,11 @@ static bool vers_prepare_keys(THD *thd, HA_CREATE_INFO *create_info,
return false; return false;
} }
handler *mysql_create_frm_image(THD *thd, handler *mysql_create_frm_image(THD *thd, const LEX_CSTRING *db,
const LEX_CSTRING *db, const LEX_CSTRING *table_name, const LEX_CSTRING *table_name,
HA_CREATE_INFO *create_info, HA_CREATE_INFO *create_info,
Alter_info *alter_info, int create_table_mode, Alter_info *alter_info, int create_table_mode,
KEY **key_info, KEY **key_info, uint *key_count,
uint *key_count,
LEX_CUSTRING *frm) LEX_CUSTRING *frm)
{ {
uint db_options; uint db_options;
@ -4681,8 +4680,7 @@ handler *mysql_create_frm_image(THD *thd,
} }
if (mysql_prepare_create_table(thd, create_info, alter_info, &db_options, if (mysql_prepare_create_table(thd, create_info, alter_info, &db_options,
file, key_info, key_count, file, key_info, key_count, create_table_mode))
create_table_mode))
goto err; goto err;
create_info->table_options=db_options; create_info->table_options=db_options;
@ -4734,19 +4732,13 @@ err:
*/ */
static static
int create_table_impl(THD *thd, int create_table_impl(THD *thd, const LEX_CSTRING *orig_db,
const LEX_CSTRING *orig_db,
const LEX_CSTRING *orig_table_name, const LEX_CSTRING *orig_table_name,
const LEX_CSTRING *db, const LEX_CSTRING *table_name, const LEX_CSTRING *db, const LEX_CSTRING *table_name,
const char *path, const char *path, const DDL_options_st options,
const DDL_options_st options, HA_CREATE_INFO *create_info, Alter_info *alter_info,
HA_CREATE_INFO *create_info, int create_table_mode, bool *is_trans, KEY **key_info,
Alter_info *alter_info, uint *key_count, LEX_CUSTRING *frm)
int create_table_mode,
bool *is_trans,
KEY **key_info,
uint *key_count,
LEX_CUSTRING *frm)
{ {
LEX_CSTRING *alias; LEX_CSTRING *alias;
handler *file= 0; handler *file= 0;
@ -5026,13 +5018,11 @@ warn:
-1 Table was used with IF NOT EXISTS and table existed (warning, not error) -1 Table was used with IF NOT EXISTS and table existed (warning, not error)
*/ */
int mysql_create_table_no_lock(THD *thd, int mysql_create_table_no_lock(THD *thd, const LEX_CSTRING *db,
const LEX_CSTRING *db,
const LEX_CSTRING *table_name, const LEX_CSTRING *table_name,
Table_specification_st *create_info, Table_specification_st *create_info,
Alter_info *alter_info, bool *is_trans, Alter_info *alter_info, bool *is_trans,
int create_table_mode, int create_table_mode, TABLE_LIST *table_list)
TABLE_LIST *table_list)
{ {
KEY *not_used_1; KEY *not_used_1;
uint not_used_2; uint not_used_2;