@@ -4438,12 +4438,11 @@ static bool vers_prepare_keys(THD *thd, HA_CREATE_INFO *create_info,
4438
4438
return false ;
4439
4439
}
4440
4440
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,
4443
4443
HA_CREATE_INFO *create_info,
4444
4444
Alter_info *alter_info, int create_table_mode,
4445
- KEY **key_info,
4446
- uint *key_count,
4445
+ KEY **key_info, uint *key_count,
4447
4446
LEX_CUSTRING *frm)
4448
4447
{
4449
4448
uint db_options;
@@ -4681,8 +4680,7 @@ handler *mysql_create_frm_image(THD *thd,
4681
4680
}
4682
4681
4683
4682
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))
4686
4684
goto err;
4687
4685
create_info->table_options =db_options;
4688
4686
@@ -4734,19 +4732,13 @@ handler *mysql_create_frm_image(THD *thd,
4734
4732
*/
4735
4733
4736
4734
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,
4739
4736
const LEX_CSTRING *orig_table_name,
4740
4737
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)
4750
4742
{
4751
4743
LEX_CSTRING *alias;
4752
4744
handler *file= 0 ;
@@ -5026,13 +5018,11 @@ int create_table_impl(THD *thd,
5026
5018
-1 Table was used with IF NOT EXISTS and table existed (warning, not error)
5027
5019
*/
5028
5020
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,
5031
5022
const LEX_CSTRING *table_name,
5032
5023
Table_specification_st *create_info,
5033
5024
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)
5036
5026
{
5037
5027
KEY *not_used_1;
5038
5028
uint not_used_2;
0 commit comments