diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-04-18 12:35:05 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-20 16:36:23 +0200 |
| commit | 4fe65ca33a6012ec60c665f6eeb5ff08969fb267 (patch) | |
| tree | a5ef5444f1fb770f46883b42073eeaa0fd9fa29a /storage | |
| parent | 0001049be0af0d5386cbf6009aeb2101243b311a (diff) | |
| download | mariadb-git-4fe65ca33a6012ec60c665f6eeb5ff08969fb267.tar.gz | |
MDEV-12230 include/my_sys.h:600:43: error: unknown type name ‘PSI_file_key’" when -DWITHOUT_SERVER=1
cherry-pick 2c2bd8c155 (MDEV-12261 build failure without P_S) from 10.0
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); } |