summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorAnurag Shekhar <anurag.shekhar@sun.com>2009-07-24 15:41:23 +0530
committerAnurag Shekhar <anurag.shekhar@sun.com>2009-07-24 15:41:23 +0530
commit0498988b48b0318a6e7e651b1a948967de201eb9 (patch)
treed15db783325396e0044e82006c84980650316051 /sql/handler.cc
parentc6771e7bde520228caa44233e36974a27d862a22 (diff)
downloadmariadb-git-0498988b48b0318a6e7e651b1a948967de201eb9.tar.gz
Bug#30102: Rename table does corrupt tables with partition files on failure
Problem was that a failing rename just left the partitions at the state it was at the failure. Solution was to try to revert the started rename if a failure occured. mysql-test/r/partition_not_embedded.result: Bug#30102: Rename table does corrupt tables with partition files on failure New result file mysql-test/t/partition_not_embedded.test: Bug#30102: Rename table does corrupt tables with partition files on failure New test file (list_files does not report the files in embedded) sql/ha_partition.cc: Bug#30102: Rename table does corrupt tables with partition files on failure Better error handling for rename partitions (reverting the started rename operation) Different order of files for delete. sql/handler.cc: Bug#30102: Rename table does corrupt tables with partition files on failure Tries to remove as many table files as possible if the first delete succeeds.
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc25
1 files changed, 21 insertions, 4 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index e65ceba4181..c5b83cc231d 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -2973,6 +2973,7 @@ uint handler::get_dup_key(int error)
*/
int handler::delete_table(const char *name)
{
+ int saved_error= 0;
int error= 0;
int enoent_or_zero= ENOENT; // Error if no file was deleted
char buff[FN_REFLEN];
@@ -2982,21 +2983,31 @@ int handler::delete_table(const char *name)
fn_format(buff, name, "", *ext, MY_UNPACK_FILENAME|MY_APPEND_EXT);
if (my_delete_with_symlink(buff, MYF(0)))
{
- if ((error= my_errno) != ENOENT)
- break;
+ if (my_errno != ENOENT)
+ {
+ /*
+ If error on the first existing file, return the error.
+ Otherwise delete as much as possible.
+ */
+ if (enoent_or_zero)
+ return my_errno;
+ saved_error= my_errno;
+ }
}
else
enoent_or_zero= 0; // No error for ENOENT
error= enoent_or_zero;
}
- return error;
+ return saved_error ? saved_error : error;
}
int handler::rename_table(const char * from, const char * to)
{
int error= 0;
- for (const char **ext= bas_ext(); *ext ; ext++)
+ const char **ext, **start_ext;
+ start_ext= bas_ext();
+ for (ext= start_ext; *ext ; ext++)
{
if (rename_file_ext(from, to, *ext))
{
@@ -3005,6 +3016,12 @@ int handler::rename_table(const char * from, const char * to)
error= 0;
}
}
+ if (error)
+ {
+ /* Try to revert the rename. Ignore errors. */
+ for (; ext >= start_ext; ext--)
+ rename_file_ext(to, from, *ext);
+ }
return error;
}