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

ha_create_table: remove unused argument

Browse Source
This commit is contained in:
Sergei Golubchik 2013-04-09 15:49:39 +02:00
parent 556f568493
commit 5f69c8a594
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/datadict.cc
View File

@ -180,7 +180,7 @@ bool dd_recreate_table(THD *thd, const char *db, const char *table_name)
build_table_filename(path, sizeof(path) - 1, db, table_name, "", 0); build_table_filename(path, sizeof(path) - 1, db, table_name, "", 0);
/* Attempt to reconstruct the table. */ /* Attempt to reconstruct the table. */
error= ha_create_table(thd, path, db, table_name, &create_info, TRUE); error= ha_create_table(thd, path, db, table_name, &create_info);
DBUG_RETURN(error); DBUG_RETURN(error);
} }

6
sql/handler.cc
View File

@ -4132,8 +4132,7 @@ end:
*/ */
int ha_create_table(THD *thd, const char *path, int ha_create_table(THD *thd, const char *path,
const char *db, const char *table_name, const char *db, const char *table_name,
HA_CREATE_INFO *create_info, HA_CREATE_INFO *create_info)
bool update_create_info)
{ {
int error= 1; int error= 1;
TABLE table; TABLE table;
@ -4148,8 +4147,7 @@ int ha_create_table(THD *thd, const char *path,
TRUE)) TRUE))
goto err; goto err;
if (update_create_info) update_create_info_from_table(create_info, &table);
update_create_info_from_table(create_info, &table);
name= get_canonical_filename(table.file, share.path.str, name_buff); name= get_canonical_filename(table.file, share.path.str, name_buff);

3
sql/handler.h
View File

@ -3093,8 +3093,7 @@ void ha_checkpoint_state(bool disable);
void ha_commit_checkpoint_request(void *cookie, void (*pre_hook)(void *)); void ha_commit_checkpoint_request(void *cookie, void (*pre_hook)(void *));
int ha_create_table(THD *thd, const char *path, int ha_create_table(THD *thd, const char *path,
const char *db, const char *table_name, const char *db, const char *table_name,
HA_CREATE_INFO *create_info, HA_CREATE_INFO *create_info);
bool update_create_info);
int ha_delete_table(THD *thd, handlerton *db_type, const char *path, int ha_delete_table(THD *thd, handlerton *db_type, const char *path,
const char *db, const char *alias, bool generate_warning); const char *db, const char *alias, bool generate_warning);

2
sql/sql_truncate.cc
View File

@ -276,7 +276,7 @@ static bool recreate_temporary_table(THD *thd, TABLE *table)
on table and schema names. on table and schema names.
*/ */
ha_create_table(thd, share->normalized_path.str, share->db.str, ha_create_table(thd, share->normalized_path.str, share->db.str,
share->table_name.str, &create_info, 1); share->table_name.str, &create_info);
if (open_table_uncached(thd, share->path.str, share->db.str, if (open_table_uncached(thd, share->path.str, share->db.str,
share->table_name.str, TRUE)) share->table_name.str, TRUE))

2
sql/unireg.cc
View File

@ -478,7 +478,7 @@ int rea_create_table(THD *thd, const char *path,
if (!create_info->frm_only && if (!create_info->frm_only &&
(file->ha_create_partitioning_metadata(path, NULL, CHF_CREATE_FLAG, (file->ha_create_partitioning_metadata(path, NULL, CHF_CREATE_FLAG,
create_info) || create_info) ||
ha_create_table(thd, path, db, table_name, create_info, 0))) ha_create_table(thd, path, db, table_name, create_info)))
goto err_handler; goto err_handler;
DBUG_RETURN(0); DBUG_RETURN(0);