diff options
author | unknown <msvensson@neptunus.(none)> | 2005-04-28 10:49:18 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2005-04-28 10:49:18 +0200 |
commit | 2c8e261725b4a7d57ee56058090b14f106d41c5b (patch) | |
tree | f70f9f5f7510bf1baacdcba689ce81f375b7d7e5 /sql/handler.cc | |
parent | 5444ad94009330a1db7f978290e998fafd23d501 (diff) | |
download | mariadb-git-2c8e261725b4a7d57ee56058090b14f106d41c5b.tar.gz |
BUG#9911 After review fixes
- Remove ha_archive::rename_table and move the fix to handler::rename_table
sql/examples/ha_archive.cc:
Remove ha_archive::rename_table
sql/examples/ha_archive.h:
Remove ha_archive::rename_table
sql/handler.cc:
Fix handler::rename_table so it does not care about if the file to rename is missing
Diffstat (limited to 'sql/handler.cc')
-rw-r--r-- | sql/handler.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 7c369a72392..f174f51514e 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1255,13 +1255,17 @@ int handler::delete_table(const char *name) int handler::rename_table(const char * from, const char * to) { - DBUG_ENTER("handler::rename_table"); - for (const char **ext=bas_ext(); *ext ; ext++) + int error= 0; + for (const char **ext= bas_ext(); *ext ; ext++) { - if (rename_file_ext(from,to,*ext)) - DBUG_RETURN(my_errno); + if (rename_file_ext(from, to, *ext)) + { + if ((error=my_errno) != ENOENT) + break; + error= 0; + } } - DBUG_RETURN(0); + return error; } /* |