diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-21 19:20:44 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-21 19:20:44 +0100 |
| commit | 09a2107b1b2f5567b8a50afec9e54a33284c6233 (patch) | |
| tree | a9f544eb24b6b5ec510fa580cd997356671996d3 /sql/sql_db.cc | |
| parent | bbf0c9d4c35034c8634cd9607712d94fac089127 (diff) | |
| parent | 0d622bed4f1a1484af747840c39325c67d7767d4 (diff) | |
| download | mariadb-git-09a2107b1b2f5567b8a50afec9e54a33284c6233.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 701f4e6aa4e..f626b4e6112 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -846,7 +846,7 @@ 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_handler_delete_with_symlink(key_file_misc, path, "", MYF(0)) && + if (mysql_file_delete_with_symlink(key_file_misc, path, "", MYF(0)) && my_errno != ENOENT) { my_error(EE_DELETE, MYF(0), path, my_errno); @@ -1152,7 +1152,7 @@ static bool find_db_tables_and_rm_known_files(THD *thd, MY_DIR *dirp, We ignore ENOENT error in order to skip files that was deleted by concurrently running statement like REPAIR TABLE ... */ - if (my_handler_delete_with_symlink(key_file_misc, 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); @@ -1268,7 +1268,7 @@ long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, const char *org_path) continue; } strxmov(filePath, org_path, "/", file->name, NullS); - if (my_handler_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; } |