diff options
| -rw-r--r-- | sql/ha_partition.cc | 3 | ||||
| -rw-r--r-- | sql/ha_partition.h | 3 | ||||
| -rw-r--r-- | sql/handler.cc | 4 | ||||
| -rw-r--r-- | sql/handler.h | 4 | ||||
| -rw-r--r-- | sql/sql_table.cc | 13 | ||||
| -rw-r--r-- | sql/unireg.cc | 6 |
6 files changed, 14 insertions, 19 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index efb3ceae51f..b28580b7831 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -529,8 +529,7 @@ int ha_partition::rename_table(const char *from, const char *to) int ha_partition::create_partitioning_metadata(const char *path, const char *old_path, - int action_flag, - HA_CREATE_INFO *create_info) + int action_flag) { DBUG_ENTER("ha_partition::create_partitioning_metadata()"); diff --git a/sql/ha_partition.h b/sql/ha_partition.h index 4f753cf5a9e..01b77e3f092 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -239,8 +239,7 @@ public: virtual int create(const char *name, TABLE *form, HA_CREATE_INFO *create_info); virtual int create_partitioning_metadata(const char *name, - const char *old_name, int action_flag, - HA_CREATE_INFO *create_info); + const char *old_name, int action_flag); virtual void update_create_info(HA_CREATE_INFO *create_info); virtual char *update_table_comment(const char *comment); virtual int change_partitions(HA_CREATE_INFO *create_info, diff --git a/sql/handler.cc b/sql/handler.cc index 735c2b012e6..b9480e8611d 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3844,11 +3844,11 @@ handler::ha_create(const char *name, TABLE *form, HA_CREATE_INFO *info) int handler::ha_create_partitioning_metadata(const char *name, const char *old_name, - int action_flag, HA_CREATE_INFO *info) + int action_flag) { mark_trx_read_write(); - return create_partitioning_metadata(name, old_name, action_flag, info); + return create_partitioning_metadata(name, old_name, action_flag); } diff --git a/sql/handler.h b/sql/handler.h index d2dbe169101..3424fa22edf 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -2067,7 +2067,7 @@ public: int ha_create(const char *name, TABLE *form, HA_CREATE_INFO *info); int ha_create_partitioning_metadata(const char *name, const char *old_name, - int action_flag, HA_CREATE_INFO *info); + int action_flag); int ha_change_partitions(HA_CREATE_INFO *create_info, const char *path, @@ -3007,7 +3007,7 @@ private: virtual int create(const char *name, TABLE *form, HA_CREATE_INFO *info)=0; virtual int create_partitioning_metadata(const char *name, const char *old_name, - int action_flag, HA_CREATE_INFO *info) + int action_flag) { return FALSE; } virtual int change_partitions(HA_CREATE_INFO *create_info, diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 46e9dff1833..4f1fdc2e0db 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1713,7 +1713,7 @@ bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags) my_free(const_cast<uchar*>(frm.str)); if (error || lpt->table->file->ha_create_partitioning_metadata(shadow_path, - NULL, CHF_CREATE_FLAG, lpt->create_info)) + NULL, CHF_CREATE_FLAG)) { mysql_file_delete(key_file_frm, shadow_frm_name, MYF(0)); error= 1; @@ -1765,13 +1765,13 @@ bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags) if (mysql_file_delete(key_file_frm, frm_name, MYF(MY_WME)) || #ifdef WITH_PARTITION_STORAGE_ENGINE lpt->table->file->ha_create_partitioning_metadata(path, shadow_path, - CHF_DELETE_FLAG, NULL) || + CHF_DELETE_FLAG) || deactivate_ddl_log_entry(part_info->frm_log_entry->entry_pos) || (sync_ddl_log(), FALSE) || mysql_file_rename(key_file_frm, shadow_frm_name, frm_name, MYF(MY_WME)) || lpt->table->file->ha_create_partitioning_metadata(path, shadow_path, - CHF_RENAME_FLAG, NULL)) + CHF_RENAME_FLAG)) #else mysql_file_rename(key_file_frm, shadow_frm_name, frm_name, MYF(MY_WME))) @@ -4048,7 +4048,7 @@ static bool check_if_created_table_can_be_opened(THD *thd, /* It is impossible to open definition of partitioned table without .par file. */ - if (file->ha_create_partitioning_metadata(path, NULL, CHF_CREATE_FLAG, create_info)) + if (file->ha_create_partitioning_metadata(path, NULL, CHF_CREATE_FLAG)) return TRUE; init_tmp_table_share(thd, &share, db, 0, table_name, path); @@ -4060,7 +4060,7 @@ static bool check_if_created_table_can_be_opened(THD *thd, (void) closefrm(&table, 0); free_table_share(&share); - (void) file->ha_create_partitioning_metadata(path, NULL, CHF_DELETE_FLAG, create_info); + (void) file->ha_create_partitioning_metadata(path, NULL, CHF_DELETE_FLAG); return result; } #endif @@ -7172,8 +7172,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, /* Tell the handler that a new frm file is in place. */ error= t_table_list->table->file->ha_create_partitioning_metadata(path, NULL, - CHF_INDEX_FLAG, - create_info); + CHF_INDEX_FLAG); DBUG_ASSERT(thd->open_tables == t_table_list->table); close_thread_table(thd, &thd->open_tables); diff --git a/sql/unireg.cc b/sql/unireg.cc index 811ee50e502..bb34c6e800b 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -384,12 +384,10 @@ int rea_create_table(THD *thd, LEX_CUSTRING *frm, if (thd->variables.keep_files_on_create) create_info->options|= HA_CREATE_KEEP_FILES; - if (file->ha_create_partitioning_metadata(path, NULL, CHF_CREATE_FLAG, - create_info) || + if (file->ha_create_partitioning_metadata(path, NULL, CHF_CREATE_FLAG) || ha_create_table(thd, path, db, table_name, create_info, frm)) { - file->ha_create_partitioning_metadata(path, NULL, CHF_DELETE_FLAG, - create_info); + file->ha_create_partitioning_metadata(path, NULL, CHF_DELETE_FLAG); goto err_handler; } } |