diff options
author | Georgi Kodinov <kgeorge@mysql.com> | 2009-01-05 12:37:56 +0200 |
---|---|---|
committer | Georgi Kodinov <kgeorge@mysql.com> | 2009-01-05 12:37:56 +0200 |
commit | e56284128f628691dff3541d326b819b87eda571 (patch) | |
tree | 0491673cf57973c2fb48b443091aa19d35eb5f2a /sql/sql_show.cc | |
parent | 4c788d93b1cebb896ff40b2d5056373dc1b0e9d1 (diff) | |
download | mariadb-git-e56284128f628691dff3541d326b819b87eda571.tar.gz |
Reverted the fix for bug #25830 because of omissions and non-complete test
case.
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r-- | sql/sql_show.cc | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 2d8d6b13d4e..d6bb3427fe4 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -287,17 +287,11 @@ find_files(THD *thd, List<char> *files, const char *db, #ifndef NO_EMBEDDED_ACCESS_CHECKS uint col_access=thd->col_access; #endif - uint wild_length= 0; TABLE_LIST table_list; DBUG_ENTER("find_files"); - if (wild) - { - if (!wild[0]) - wild= 0; - else - wild_length= strlen(wild); - } + if (wild && !wild[0]) + wild=0; bzero((char*) &table_list,sizeof(table_list)); @@ -346,11 +340,8 @@ find_files(THD *thd, List<char> *files, const char *db, { if (lower_case_table_names) { - if (my_wildcmp(files_charset_info, - file->name, file->name + strlen(file->name), - wild, wild + wild_length, - wild_prefix, wild_one, wild_many)) - continue; + if (wild_case_compare(files_charset_info, file->name, wild)) + continue; } else if (wild_compare(file->name,wild,0)) continue; |