diff options
| -rw-r--r-- | sql/datadict.cc | 2 | ||||
| -rw-r--r-- | sql/handler.cc | 6 | ||||
| -rw-r--r-- | sql/handler.h | 3 | ||||
| -rw-r--r-- | sql/sql_truncate.cc | 2 | ||||
| -rw-r--r-- | sql/unireg.cc | 2 |
5 files changed, 6 insertions, 9 deletions
diff --git a/sql/datadict.cc b/sql/datadict.cc index 3b125d47235..c228784d578 100644 --- a/sql/datadict.cc +++ b/sql/datadict.cc @@ -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); /* 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); } diff --git a/sql/handler.cc b/sql/handler.cc index a1c4ba89035..b8ad8678b87 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -4132,8 +4132,7 @@ end: */ int ha_create_table(THD *thd, const char *path, const char *db, const char *table_name, - HA_CREATE_INFO *create_info, - bool update_create_info) + HA_CREATE_INFO *create_info) { int error= 1; TABLE table; @@ -4148,8 +4147,7 @@ int ha_create_table(THD *thd, const char *path, TRUE)) 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); diff --git a/sql/handler.h b/sql/handler.h index ea928afa9ed..11221fa3b10 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -3093,8 +3093,7 @@ void ha_checkpoint_state(bool disable); void ha_commit_checkpoint_request(void *cookie, void (*pre_hook)(void *)); int ha_create_table(THD *thd, const char *path, const char *db, const char *table_name, - HA_CREATE_INFO *create_info, - bool update_create_info); + HA_CREATE_INFO *create_info); int ha_delete_table(THD *thd, handlerton *db_type, const char *path, const char *db, const char *alias, bool generate_warning); diff --git a/sql/sql_truncate.cc b/sql/sql_truncate.cc index d47fb24eaba..041bc178a0d 100644 --- a/sql/sql_truncate.cc +++ b/sql/sql_truncate.cc @@ -276,7 +276,7 @@ static bool recreate_temporary_table(THD *thd, TABLE *table) on table and schema names. */ 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, share->table_name.str, TRUE)) diff --git a/sql/unireg.cc b/sql/unireg.cc index e2381e34fc7..60d419808ef 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -478,7 +478,7 @@ int rea_create_table(THD *thd, const char *path, if (!create_info->frm_only && (file->ha_create_partitioning_metadata(path, NULL, CHF_CREATE_FLAG, 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; DBUG_RETURN(0); |