diff options
| author | unknown <kevin.lewis@oracle.com> | 2010-07-22 11:17:26 -0500 |
|---|---|---|
| committer | unknown <kevin.lewis@oracle.com> | 2010-07-22 11:17:26 -0500 |
| commit | 9293e4308a8c8987209b4aab5096766072b654cf (patch) | |
| tree | 3adafdaa9919a0a92099d73fff2af022a4b63b43 /sql/sql_show.cc | |
| parent | e9a52f962f2d89fe1938145105bcb35f970a2414 (diff) | |
| parent | 1df84604ed42ebd126fe8fae60dd372b9bc45230 (diff) | |
| download | mariadb-git-9293e4308a8c8987209b4aab5096766072b654cf.tar.gz | |
Merge
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index c979d44dc1c..3e66cda16e1 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -521,8 +521,19 @@ find_files(THD *thd, List<LEX_STRING> *files, const char *db, continue; file_name_len= filename_to_tablename(file->name, uname, sizeof(uname)); - if (wild && wild_compare(uname, wild, 0)) - continue; + if (wild) + { + if (lower_case_table_names) + { + if (my_wildcmp(files_charset_info, + uname, uname + file_name_len, + wild, wild + wild_length, + wild_prefix, wild_one,wild_many)) + continue; + } + else if (wild_compare(uname, wild, 0)) + continue; + } if (!(file_name= thd->make_lex_string(file_name, uname, file_name_len, TRUE))) { |