summaryrefslogtreecommitdiff
path: root/storage/maria
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-03-15 11:46:54 +0100
committerSergei Golubchik <serg@mariadb.org>2017-03-15 17:48:30 +0100
commit2c2bd8c1556b081fccd0fc3e010dc3ea2c38fffb (patch)
treea43c7e2f6fdec4910f6c06e00be4f41d17fd1a13 /storage/maria
parent06f1f1aa6e3dbc1efcd623378fe415b27c32b944 (diff)
downloadmariadb-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 'storage/maria')
-rw-r--r--storage/maria/ma_delete_table.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/maria/ma_delete_table.c b/storage/maria/ma_delete_table.c
index a9ab8e596cc..186075dac68 100644
--- a/storage/maria/ma_delete_table.c
+++ b/storage/maria/ma_delete_table.c
@@ -86,11 +86,11 @@ int maria_delete_table_files(const char *name, myf sync_dir)
{
DBUG_ENTER("maria_delete_table_files");
- if (my_handler_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, MYF(MY_WME | sync_dir)) ||
- my_handler_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, MYF(MY_WME | sync_dir)))
+ if (mysql_file_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, MYF(MY_WME | sync_dir)) ||
+ mysql_file_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, MYF(MY_WME | sync_dir)))
DBUG_RETURN(my_errno);
- my_handler_delete_with_symlink(key_file_dfile, name, ".TMD", MYF(0));
- my_handler_delete_with_symlink(key_file_dfile, name, ".OLD", MYF(0));
+ mysql_file_delete_with_symlink(key_file_dfile, name, ".TMD", MYF(0));
+ mysql_file_delete_with_symlink(key_file_dfile, name, ".OLD", MYF(0));
DBUG_RETURN(0);
}