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 /sql | |
| 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 'sql')
| -rw-r--r-- | sql/handler.cc | 2 | ||||
| -rw-r--r-- | sql/sql_db.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 2ae144a86cc..dc40e34bc3d 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3381,7 +3381,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 7bb4f0fa60e..580590b38a3 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -1085,7 +1085,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); @@ -1206,7 +1206,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; } |