diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-03 20:12:48 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-03 20:12:48 +0200 |
| commit | 606a4a48475c95480751755e811e0b6c76ce1c3e (patch) | |
| tree | 0fdd33aed4a00ec7e5825e881f59667373873eca /storage/maria | |
| parent | 1acfa942edb72fedcf92dd017ae5fef8694382e5 (diff) | |
| download | mariadb-git-606a4a48475c95480751755e811e0b6c76ce1c3e.tar.gz | |
Post MDEV-11902 Fix test failures in maria and myisam storage engines
my_readline can fail due to missing file. Make my_readline report this
condition separately so that we can catch it and report an appropriate
error message to the user.
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/ma_open.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/storage/maria/ma_open.c b/storage/maria/ma_open.c index b37ebb8ff8b..1db85180fcf 100644 --- a/storage/maria/ma_open.c +++ b/storage/maria/ma_open.c @@ -298,6 +298,11 @@ MARIA_HA *maria_open(const char *name, int mode, uint open_flags) realpath_err= my_realpath(name_buff, fn_format(org_name, name, "", MARIA_NAME_IEXT, MY_UNPACK_FILENAME),MYF(0)); + if (realpath_err > 0) /* File not found, no point in looking further. */ + { + DBUG_RETURN(NULL); + } + if (my_is_symlink(org_name) && (realpath_err || mysys_test_invalid_symlink(name_buff))) { |