MDEV-5815 MySQL BUG#11751736: DROP DATABASE STATEMENT SHOULD REMOVE .OLD SUFFIX FROM DATABASE DIRECTORY

Delete .OLD and .TMD files when a MyISAM table is dropped.
Same for Aria.

sql/sql_db.cc:
  dead code - *.TMD cannot be deleted from here.
This commit is contained in:
Sergei Golubchik 2014-03-26 09:32:54 +01:00
commit 1b468ca675
5 changed files with 58 additions and 29 deletions

View file

@ -92,7 +92,14 @@ int maria_delete_table_files(const char *name, myf sync_dir)
MYF(MY_WME | sync_dir)))
DBUG_RETURN(my_errno);
fn_format(from,name,"",MARIA_NAME_DEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
DBUG_RETURN(mysql_file_delete_with_symlink(key_file_dfile,
from, MYF(MY_WME | sync_dir)) ?
my_errno : 0);
if (mysql_file_delete_with_symlink(key_file_dfile, from,
MYF(MY_WME | sync_dir)))
DBUG_RETURN(my_errno);
// optional files from maria_pack:
fn_format(from,name,"",".TMD",MY_UNPACK_FILENAME|MY_APPEND_EXT);
mysql_file_delete_with_symlink(key_file_dfile, from, MYF(0));
fn_format(from,name,"",".OLD",MY_UNPACK_FILENAME|MY_APPEND_EXT);
mysql_file_delete_with_symlink(key_file_dfile, from, MYF(0));
DBUG_RETURN(0);
}