diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2010-01-19 12:18:48 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2010-01-19 12:18:48 +0100 |
| commit | 8c6d6c0c6caaecfce24ae031ffca1f0031ce798d (patch) | |
| tree | 07f278807b69db0038942ff2df4c57c2eaeefcc9 /sql/sql_partition.cc | |
| parent | b60d59b958e276b966d44cb8cfd38fe9547da586 (diff) | |
| parent | eab2be0aeed0459c505578a716f8b0ae88a8f365 (diff) | |
| download | mariadb-git-8c6d6c0c6caaecfce24ae031ffca1f0031ce798d.tar.gz | |
merge
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 2f22432c416..329317f4293 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -5705,8 +5705,7 @@ static bool write_log_drop_partition(ALTER_PARTITION_PARAM_TYPE *lpt) part_info->first_log_entry= NULL; build_table_filename(path, sizeof(path) - 1, lpt->db, lpt->table_name, "", 0); - build_table_filename(tmp_path, sizeof(tmp_path) - 1, lpt->db, - lpt->table_name, "#", 0); + build_table_shadow_filename(tmp_path, sizeof(tmp_path) - 1, lpt); pthread_mutex_lock(&LOCK_gdl); if (write_log_dropped_partitions(lpt, &next_entry, (const char*)path, FALSE)) @@ -5762,8 +5761,7 @@ static bool write_log_add_change_partition(ALTER_PARTITION_PARAM_TYPE *lpt) build_table_filename(path, sizeof(path) - 1, lpt->db, lpt->table_name, "", 0); - build_table_filename(tmp_path, sizeof(tmp_path) - 1, lpt->db, - lpt->table_name, "#", 0); + build_table_shadow_filename(tmp_path, sizeof(tmp_path) - 1, lpt); pthread_mutex_lock(&LOCK_gdl); if (write_log_dropped_partitions(lpt, &next_entry, (const char*)path, FALSE)) @@ -5988,7 +5986,7 @@ void handle_alter_part_error(ALTER_PARTITION_PARAM_TYPE *lpt, partition_info *part_info= lpt->part_info; DBUG_ENTER("handle_alter_part_error"); - if (!part_info->first_log_entry && + if (part_info->first_log_entry && execute_ddl_log_entry(current_thd, part_info->first_log_entry->entry_pos)) { |