diff options
| author | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-05-03 10:16:15 +0530 |
|---|---|---|
| committer | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-05-03 10:16:15 +0530 |
| commit | 1c142800486f58653aac007b0873d8c1aa712960 (patch) | |
| tree | 512bb39b1227ca564ab77b4f085c7f9e541b26ba /storage | |
| parent | f359f664e9e4de804ffd33e222d00c6140655452 (diff) | |
| parent | dbe2c3c5f21fd479fbe0993b045c0c30493ca07a (diff) | |
| download | mariadb-git-1c142800486f58653aac007b0873d8c1aa712960.tar.gz | |
Merge tag 'mariadb-5.5.56' into 5.5-galera
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/maria/ma_delete_table.c | 4 | ||||
| -rw-r--r-- | storage/myisam/mi_delete_table.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/storage/maria/ma_delete_table.c b/storage/maria/ma_delete_table.c index c4bcd5ba060..f80ec1384b3 100644 --- a/storage/maria/ma_delete_table.c +++ b/storage/maria/ma_delete_table.c @@ -86,8 +86,8 @@ 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, sync_dir) || - my_handler_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, sync_dir)) + if (mysql_file_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, sync_dir) || + mysql_file_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, sync_dir)) DBUG_RETURN(my_errno); DBUG_RETURN(0); } diff --git a/storage/myisam/mi_delete_table.c b/storage/myisam/mi_delete_table.c index ebedfbda343..ca395ffbef5 100644 --- a/storage/myisam/mi_delete_table.c +++ b/storage/myisam/mi_delete_table.c @@ -28,8 +28,8 @@ 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, 0) || - my_handler_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, 0)) + if (mysql_file_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, 0) || + mysql_file_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, 0)) DBUG_RETURN(my_errno); DBUG_RETURN(0); } |