diff options
| author | monty@mysql.com <> | 2003-12-11 06:24:08 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2003-12-11 06:24:08 +0200 |
| commit | 7e92336b1da07c6424f3bdffcc5d3edf268268fa (patch) | |
| tree | 1122f20a76a6996599a4c136c6be17aecb8f8bf6 /sql/sql_show.cc | |
| parent | 34d0a16476e0db669bbe7cd9e56bb1d55ac1f18d (diff) | |
| download | mariadb-git-7e92336b1da07c6424f3bdffcc5d3edf268268fa.tar.gz | |
Fixed a possible memory leak on MacOSX when using the shared libmysql.so library (Bug #2061)
mysql_server_init() now returns error code if something went wrong (Bug #2062)
Don't use my_fopen() when reading symlink information as this may cause problems when a lot of files are opened.
Free thread keys with pthread_key_delete() instead of relying on automatic free. (Bug #2062)
Fixed bug in UNION statement with alias '*'. (Bug #1249)
Fixed a bug in DELETE ... ORDER BY ... LIMIT where the rows where not deleted in the proper order. (Bug #1024).
FOUND_ROWS() could return incorrect number of rows after a query with an impossible WHERE condition.
HOW DATABASES doesn't anymore show .sym files (on windows) that doesn't point to a valid directory. (Bug #1385)
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index a7de04d0bfa..cb6cd18b7c8 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -197,7 +197,19 @@ mysql_find_files(THD *thd,List<char> *files, const char *db,const char *path, #ifdef USE_SYMDIR char *ext; if (my_use_symdir && !strcmp(ext=fn_ext(file->name), ".sym")) + { + /* Only show the sym file if it points to a directory */ + char buff[FN_REFLEN], *end; + MY_STAT status; *ext=0; /* Remove extension */ + unpack_dirname(buff, file->name); + end= strend(buff); + if (end != buff && end[-1] == FN_LIBCHAR) + end[-1]= 0; // Remove end FN_LIBCHAR + if (!my_stat(buff, &status, MYF(0)) || + !MY_S_ISDIR(status.st_mode)) + continue; + } else #endif { |