diff options
| author | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-04-18 12:01:56 +0530 |
|---|---|---|
| committer | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-04-18 12:01:56 +0530 |
| commit | 5ca8121292df337849811458b6c6671f7e9b2080 (patch) | |
| tree | f8b4cd35955681c5b2deea916f2e0dab33ce7c59 /sql/handler.cc | |
| parent | fce9a0c46ab9a8a95345a8d661d2b047e64ad7d6 (diff) | |
| parent | 663068c6eea736a38eff9ac183326d6c7e4e239b (diff) | |
| download | mariadb-git-5ca8121292df337849811458b6c6671f7e9b2080.tar.gz | |
Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-merge
Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 8813f7072b1..ddbc3bcf0fc 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2979,6 +2979,7 @@ void handler::print_error(int error, myf errflag) textno=ER_FILE_USED; break; case ENOENT: + case ENOTDIR: textno=ER_FILE_NOT_FOUND; break; case ENOSPC: @@ -3448,12 +3449,10 @@ int handler::delete_table(const char *name) int saved_error= 0; int error= 0; int enoent_or_zero= ENOENT; // Error if no file was deleted - char buff[FN_REFLEN]; for (const char **ext=bas_ext(); *ext ; ext++) { - fn_format(buff, name, "", *ext, MY_UNPACK_FILENAME|MY_APPEND_EXT); - if (mysql_file_delete_with_symlink(key_file_misc, buff, MYF(0))) + if (my_handler_delete_with_symlink(key_file_misc, name, *ext, 0)) { if (my_errno != ENOENT) { |