diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-15 11:46:54 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-15 17:48:30 +0100 |
| commit | 2c2bd8c1556b081fccd0fc3e010dc3ea2c38fffb (patch) | |
| tree | a43c7e2f6fdec4910f6c06e00be4f41d17fd1a13 /sql | |
| parent | 06f1f1aa6e3dbc1efcd623378fe415b27c32b944 (diff) | |
| download | mariadb-git-2c2bd8c1556b081fccd0fc3e010dc3ea2c38fffb.tar.gz | |
MDEV-12261 build failure without P_S
restore mysql_file_delete_with_symlink() but let it use
new my_handler_delete_with_symlink() mysys helper.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/handler.cc | 2 | ||||
| -rw-r--r-- | sql/sql_db.cc | 6 | ||||
| -rw-r--r-- | sql/table.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 7fa8afdb253..fc70ed5affc 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3850,7 +3850,7 @@ int handler::delete_table(const char *name) for (const char **ext=bas_ext(); *ext ; ext++) { - if (my_handler_delete_with_symlink(key_file_misc, name, *ext, 0)) + if (mysql_file_delete_with_symlink(key_file_misc, name, *ext, 0)) { if (my_errno != ENOENT) { diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 3f43a33ab7c..6c8c384e544 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -815,7 +815,7 @@ bool mysql_rm_db(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); @@ -1119,7 +1119,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); @@ -1235,7 +1235,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; } diff --git a/sql/table.cc b/sql/table.cc index 80d0e02c6b1..975d9d53882 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -569,7 +569,7 @@ enum open_frm_error open_table_def(THD *thd, TABLE_SHARE *share, uint flags) { DBUG_ASSERT(flags & GTS_TABLE); DBUG_ASSERT(flags & GTS_USE_DISCOVERY); - my_handler_delete_with_symlink(key_file_frm, path, "", MYF(0)); + mysql_file_delete_with_symlink(key_file_frm, path, "", MYF(0)); file= -1; } else |