diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-03-31 16:40:29 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-03-31 16:40:29 +0400 |
| commit | f00a314f9a659399eff392c4b635d1c381b9badb (patch) | |
| tree | c64e89699dcc22b4ba3a62f83f21252c486617ce /sql/sql_db.cc | |
| parent | e191833d758e89d282aea2d84126c9ca10036571 (diff) | |
| parent | 2f3d4bd566b5e377fe8a1749c14050b0a0e083d0 (diff) | |
| download | mariadb-git-f00a314f9a659399eff392c4b635d1c381b9badb.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 2a5f8a37fa0..6b29d345432 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -832,7 +832,8 @@ mysql_rm_db_internal(THD *thd,char *db, bool if_exists, bool silent) if there exists a table with the name 'db', so let's just do it separately. We know this file exists and needs to be deleted anyway. */ - if (my_delete_with_symlink(path, MYF(0)) && my_errno != ENOENT) + if (mysql_file_delete_with_symlink(key_file_misc, path, "", MYF(0)) && + my_errno != ENOENT) { my_error(EE_DELETE, MYF(0), path, my_errno); DBUG_RETURN(true); @@ -1139,9 +1140,9 @@ static bool find_db_tables_and_rm_known_files(THD *thd, MY_DIR *dirp, strxmov(filePath, path, "/", file->name, NullS); /* We ignore ENOENT error in order to skip files that was deleted - by concurrently running statement like REAPIR TABLE ... + by concurrently running statement like REPAIR TABLE ... */ - if (my_delete_with_symlink(filePath, MYF(0)) && + if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(0)) && my_errno != ENOENT) { my_error(EE_DELETE, MYF(0), filePath, my_errno); @@ -1257,7 +1258,7 @@ long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, const char *org_path) continue; } strxmov(filePath, org_path, "/", file->name, NullS); - if (mysql_file_delete_with_symlink(key_file_misc, filePath, MYF(MY_WME))) + if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(MY_WME))) { goto err; } |