mirror of
https://github.com/MariaDB/server.git
synced 2025-01-28 01:34:17 +01:00
cleanup: reformat
This commit is contained in:
parent
c0745e3730
commit
84cbd69c9e
2 changed files with 13 additions and 25 deletions
|
@ -4147,10 +4147,8 @@ Field *Item::create_field_for_create_select(TABLE *table)
|
|||
@retval 0 Error
|
||||
*/
|
||||
|
||||
TABLE *select_create::create_table_from_items(THD *thd,
|
||||
List<Item> *items,
|
||||
MYSQL_LOCK **lock,
|
||||
TABLEOP_HOOKS *hooks)
|
||||
TABLE *select_create::create_table_from_items(THD *thd, List<Item> *items,
|
||||
MYSQL_LOCK **lock, TABLEOP_HOOKS *hooks)
|
||||
{
|
||||
TABLE tmp_table; // Used during 'Create_field()'
|
||||
TABLE_SHARE share;
|
||||
|
|
|
@ -4438,12 +4438,11 @@ static bool vers_prepare_keys(THD *thd, HA_CREATE_INFO *create_info,
|
|||
return false;
|
||||
}
|
||||
|
||||
handler *mysql_create_frm_image(THD *thd,
|
||||
const LEX_CSTRING *db, const LEX_CSTRING *table_name,
|
||||
handler *mysql_create_frm_image(THD *thd, const LEX_CSTRING *db,
|
||||
const LEX_CSTRING *table_name,
|
||||
HA_CREATE_INFO *create_info,
|
||||
Alter_info *alter_info, int create_table_mode,
|
||||
KEY **key_info,
|
||||
uint *key_count,
|
||||
KEY **key_info, uint *key_count,
|
||||
LEX_CUSTRING *frm)
|
||||
{
|
||||
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,
|
||||
file, key_info, key_count,
|
||||
create_table_mode))
|
||||
file, key_info, key_count, create_table_mode))
|
||||
goto err;
|
||||
create_info->table_options=db_options;
|
||||
|
||||
|
@ -4734,19 +4732,13 @@ err:
|
|||
*/
|
||||
|
||||
static
|
||||
int create_table_impl(THD *thd,
|
||||
const LEX_CSTRING *orig_db,
|
||||
int create_table_impl(THD *thd, const LEX_CSTRING *orig_db,
|
||||
const LEX_CSTRING *orig_table_name,
|
||||
const LEX_CSTRING *db, const LEX_CSTRING *table_name,
|
||||
const char *path,
|
||||
const DDL_options_st options,
|
||||
HA_CREATE_INFO *create_info,
|
||||
Alter_info *alter_info,
|
||||
int create_table_mode,
|
||||
bool *is_trans,
|
||||
KEY **key_info,
|
||||
uint *key_count,
|
||||
LEX_CUSTRING *frm)
|
||||
const char *path, const DDL_options_st options,
|
||||
HA_CREATE_INFO *create_info, Alter_info *alter_info,
|
||||
int create_table_mode, bool *is_trans, KEY **key_info,
|
||||
uint *key_count, LEX_CUSTRING *frm)
|
||||
{
|
||||
LEX_CSTRING *alias;
|
||||
handler *file= 0;
|
||||
|
@ -5026,13 +5018,11 @@ warn:
|
|||
-1 Table was used with IF NOT EXISTS and table existed (warning, not error)
|
||||
*/
|
||||
|
||||
int mysql_create_table_no_lock(THD *thd,
|
||||
const LEX_CSTRING *db,
|
||||
int mysql_create_table_no_lock(THD *thd, const LEX_CSTRING *db,
|
||||
const LEX_CSTRING *table_name,
|
||||
Table_specification_st *create_info,
|
||||
Alter_info *alter_info, bool *is_trans,
|
||||
int create_table_mode,
|
||||
TABLE_LIST *table_list)
|
||||
int create_table_mode, TABLE_LIST *table_list)
|
||||
{
|
||||
KEY *not_used_1;
|
||||
uint not_used_2;
|
||||
|
|
Loading…
Add table
Reference in a new issue