Skip to content

Commit 84cbd69

Browse files
committed
cleanup: reformat
1 parent c0745e3 commit 84cbd69

File tree

2 files changed

+13
-25
lines changed

2 files changed

+13
-25
lines changed

sql/sql_insert.cc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4147,10 +4147,8 @@ Field *Item::create_field_for_create_select(TABLE *table)
41474147
@retval 0 Error
41484148
*/
41494149

4150-
TABLE *select_create::create_table_from_items(THD *thd,
4151-
List<Item> *items,
4152-
MYSQL_LOCK **lock,
4153-
TABLEOP_HOOKS *hooks)
4150+
TABLE *select_create::create_table_from_items(THD *thd, List<Item> *items,
4151+
MYSQL_LOCK **lock, TABLEOP_HOOKS *hooks)
41544152
{
41554153
TABLE tmp_table; // Used during 'Create_field()'
41564154
TABLE_SHARE share;

sql/sql_table.cc

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4438,12 +4438,11 @@ static bool vers_prepare_keys(THD *thd, HA_CREATE_INFO *create_info,
44384438
return false;
44394439
}
44404440

4441-
handler *mysql_create_frm_image(THD *thd,
4442-
const LEX_CSTRING *db, const LEX_CSTRING *table_name,
4441+
handler *mysql_create_frm_image(THD *thd, const LEX_CSTRING *db,
4442+
const LEX_CSTRING *table_name,
44434443
HA_CREATE_INFO *create_info,
44444444
Alter_info *alter_info, int create_table_mode,
4445-
KEY **key_info,
4446-
uint *key_count,
4445+
KEY **key_info, uint *key_count,
44474446
LEX_CUSTRING *frm)
44484447
{
44494448
uint db_options;
@@ -4681,8 +4680,7 @@ handler *mysql_create_frm_image(THD *thd,
46814680
}
46824681

46834682
if (mysql_prepare_create_table(thd, create_info, alter_info, &db_options,
4684-
file, key_info, key_count,
4685-
create_table_mode))
4683+
file, key_info, key_count, create_table_mode))
46864684
goto err;
46874685
create_info->table_options=db_options;
46884686

@@ -4734,19 +4732,13 @@ handler *mysql_create_frm_image(THD *thd,
47344732
*/
47354733

47364734
static
4737-
int create_table_impl(THD *thd,
4738-
const LEX_CSTRING *orig_db,
4735+
int create_table_impl(THD *thd, const LEX_CSTRING *orig_db,
47394736
const LEX_CSTRING *orig_table_name,
47404737
const LEX_CSTRING *db, const LEX_CSTRING *table_name,
4741-
const char *path,
4742-
const DDL_options_st options,
4743-
HA_CREATE_INFO *create_info,
4744-
Alter_info *alter_info,
4745-
int create_table_mode,
4746-
bool *is_trans,
4747-
KEY **key_info,
4748-
uint *key_count,
4749-
LEX_CUSTRING *frm)
4738+
const char *path, const DDL_options_st options,
4739+
HA_CREATE_INFO *create_info, Alter_info *alter_info,
4740+
int create_table_mode, bool *is_trans, KEY **key_info,
4741+
uint *key_count, LEX_CUSTRING *frm)
47504742
{
47514743
LEX_CSTRING *alias;
47524744
handler *file= 0;
@@ -5026,13 +5018,11 @@ int create_table_impl(THD *thd,
50265018
-1 Table was used with IF NOT EXISTS and table existed (warning, not error)
50275019
*/
50285020

5029-
int mysql_create_table_no_lock(THD *thd,
5030-
const LEX_CSTRING *db,
5021+
int mysql_create_table_no_lock(THD *thd, const LEX_CSTRING *db,
50315022
const LEX_CSTRING *table_name,
50325023
Table_specification_st *create_info,
50335024
Alter_info *alter_info, bool *is_trans,
5034-
int create_table_mode,
5035-
TABLE_LIST *table_list)
5025+
int create_table_mode, TABLE_LIST *table_list)
50365026
{
50375027
KEY *not_used_1;
50385028
uint not_used_2;

0 commit comments

Comments
 (0)