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 /storage | |
| 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 'storage')
| -rw-r--r-- | storage/maria/ma_delete_table.c | 8 | ||||
| -rw-r--r-- | storage/myisam/mi_delete_table.c | 8 |
2 files changed, 8 insertions, 8 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); } diff --git a/storage/myisam/mi_delete_table.c b/storage/myisam/mi_delete_table.c index 3422e6b045d..d766fb2547f 100644 --- a/storage/myisam/mi_delete_table.c +++ b/storage/myisam/mi_delete_table.c @@ -34,14 +34,14 @@ int mi_delete_table(const char *name) check_table_is_closed(name,"delete"); #endif - if (my_handler_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, MYF(MY_WME)) || - my_handler_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, MYF(MY_WME))) + if (mysql_file_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, MYF(MY_WME)) || + mysql_file_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, MYF(MY_WME))) DBUG_RETURN(my_errno); // optionally present: - my_handler_delete_with_symlink(mi_key_file_dfile, name, ".OLD", MYF(0)); - my_handler_delete_with_symlink(mi_key_file_dfile, name, ".TMD", MYF(0)); + mysql_file_delete_with_symlink(mi_key_file_dfile, name, ".OLD", MYF(0)); + mysql_file_delete_with_symlink(mi_key_file_dfile, name, ".TMD", MYF(0)); DBUG_RETURN(0); } |