diff options
| author | malff/marcsql@weblab.(none) <> | 2007-06-15 11:36:31 -0600 |
|---|---|---|
| committer | malff/marcsql@weblab.(none) <> | 2007-06-15 11:36:31 -0600 |
| commit | 7e36d37eb0bfa38147ef5699fb933884b61efd11 (patch) | |
| tree | e69d0f413364d2123ae31e0f8e09637140cf95ef /sql/sql_partition.cc | |
| parent | 9e6685dc74180ebbe7344a5403c498f1f9a22153 (diff) | |
| parent | e6a478dee6a36f515d24b0ed6c30f8dc1d30c6ae (diff) | |
| download | mariadb-git-7e36d37eb0bfa38147ef5699fb933884b61efd11.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 05e85b34a9c..407a0b3dcf2 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -5458,8 +5458,7 @@ static bool write_log_drop_shadow_frm(ALTER_PARTITION_PARAM_TYPE *lpt) char shadow_path[FN_LEN]; DBUG_ENTER("write_log_drop_shadow_frm"); - build_table_filename(shadow_path, sizeof(shadow_path), lpt->db, - lpt->table_name, "#", 0); + build_table_shadow_filename(shadow_path, sizeof(shadow_path), lpt); pthread_mutex_lock(&LOCK_gdl); if (write_log_replace_delete_frm(lpt, 0UL, NULL, (const char*)shadow_path, FALSE)) @@ -5507,8 +5506,7 @@ static bool write_log_rename_frm(ALTER_PARTITION_PARAM_TYPE *lpt) part_info->first_log_entry= NULL; build_table_filename(path, sizeof(path), lpt->db, lpt->table_name, "", 0); - build_table_filename(shadow_path, sizeof(shadow_path), lpt->db, - lpt->table_name, "#", 0); + build_table_shadow_filename(shadow_path, sizeof(shadow_path), lpt); pthread_mutex_lock(&LOCK_gdl); if (write_log_replace_delete_frm(lpt, 0UL, shadow_path, path, TRUE)) goto error; @@ -5673,8 +5671,7 @@ static bool write_log_final_change_partition(ALTER_PARTITION_PARAM_TYPE *lpt) part_info->first_log_entry= NULL; build_table_filename(path, sizeof(path), lpt->db, lpt->table_name, "", 0); - build_table_filename(shadow_path, sizeof(shadow_path), lpt->db, - lpt->table_name, "#", 0); + build_table_shadow_filename(shadow_path, sizeof(shadow_path), lpt); pthread_mutex_lock(&LOCK_gdl); if (write_log_dropped_partitions(lpt, &next_entry, (const char*)path, lpt->alter_info->flags & ALTER_REORGANIZE_PARTITION)) |