diff options
| author | unknown <pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-02-20 16:22:19 -0500 |
|---|---|---|
| committer | unknown <pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-02-20 16:22:19 -0500 |
| commit | 72a00b783ec438be04414d3182a0743fa7523d2b (patch) | |
| tree | 441e8397eef989027daedfb4e2b17304d437d89d /sql/ha_partition.cc | |
| parent | 5e64dc919785e251c1fd979099e2be38e459e65b (diff) | |
| download | mariadb-git-72a00b783ec438be04414d3182a0743fa7523d2b.tar.gz | |
WL 2826: Error handling of ALTER TABLE for partitioning
Bug fixes
sql/ha_partition.cc:
Bug fixes
sql/sql_partition.cc:
Bug fixes
sql/sql_table.cc:
Bug fixes
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index d65203e1b34..4bc0d4e3327 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -714,10 +714,10 @@ int ha_partition::rename_partitions(const char *path) DBUG_PRINT("info", ("Delete partition %s", norm_name_buff)); if ((ret_error= file->delete_table((const char *) norm_name_buff))) error= ret_error; - else if (inactivate_table_log_entry(sub_elem->log_entry->entry_pos)) + else if (inactivate_table_log_entry(part_elem->log_entry->entry_pos)) error= 1; else - sub_elem->log_entry= NULL; /* Indicate success */ + part_elem->log_entry= NULL; /* Indicate success */ } } while (++i < temp_partitions); VOID(sync_table_log()); @@ -780,8 +780,8 @@ int ha_partition::rename_partitions(const char *path) TEMP_PART_NAME); DBUG_PRINT("info", ("Rename subpartition from %s to %s", part_name_buff, norm_name_buff)); - if ((ret_error= file->rename_table((const char *) norm_name_buff, - (const char *) part_name_buff))) + if ((ret_error= file->rename_table((const char *) part_name_buff, + (const char *) norm_name_buff))) error= ret_error; else if (inactivate_table_log_entry(sub_elem->log_entry->entry_pos)) error= 1; @@ -797,7 +797,7 @@ int ha_partition::rename_partitions(const char *path) if (part_elem->part_state == PART_IS_CHANGED) { file= m_reorged_file[part_count++]; - DBUG_PRINT("info", ("Delete subpartition %s", norm_name_buff)); + DBUG_PRINT("info", ("Delete partition %s", norm_name_buff)); if ((ret_error= file->delete_table((const char *) norm_name_buff))) error= ret_error; else if (inactivate_table_log_entry(part_elem->log_entry->entry_pos)) @@ -810,8 +810,8 @@ int ha_partition::rename_partitions(const char *path) TRUE); DBUG_PRINT("info", ("Rename partition from %s to %s", part_name_buff, norm_name_buff)); - if ((ret_error= file->rename_table((const char *) norm_name_buff, - (const char *) part_name_buff))) + if ((ret_error= file->rename_table((const char *) part_name_buff, + (const char *) norm_name_buff))) error= ret_error; else if (inactivate_table_log_entry(part_elem->log_entry->entry_pos)) error= 1; |