diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-07-21 18:20:29 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-07-21 18:20:29 +0300 |
| commit | bbe3e4bdb68eb11b6cc8fc71663b176f8f1d037b (patch) | |
| tree | cd482ff41e52513e8a189935e708af847c374304 /sql/sql_show.cc | |
| parent | eb366b8c360b850a632c975e52a20c4c0e5c43a3 (diff) | |
| parent | e24abd9091ce28a27f27073ab70aed94851362bc (diff) | |
| download | mariadb-git-bbe3e4bdb68eb11b6cc8fc71663b176f8f1d037b.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 c13d05377e0..e05c7558f28 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -460,8 +460,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))) { |