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 | |
| parent | e9a52f962f2d89fe1938145105bcb35f970a2414 (diff) | |
| parent | 1df84604ed42ebd126fe8fae60dd372b9bc45230 (diff) | |
| download | mariadb-git-9293e4308a8c8987209b4aab5096766072b654cf.tar.gz | |
Merge
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | mysql-test/r/lowercase_table2.result | 3 | ||||
| -rw-r--r-- | sql/sql_show.cc | 15 |
3 files changed, 16 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 8dcdecf8ea2..0af6a92fcc9 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ dnl dnl When changing the major version number please also check the switch dnl statement in mysqlbinlog::check_master_version(). You may also need dnl to update version.c in ndb. -AC_INIT([MySQL Server], [5.1.49], [], [mysql]) +AC_INIT([MySQL Server], [5.1.50], [], [mysql]) AC_CONFIG_SRCDIR([sql/mysqld.cc]) AC_CANONICAL_SYSTEM diff --git a/mysql-test/r/lowercase_table2.result b/mysql-test/r/lowercase_table2.result index 51c2ac0faf5..c9a46b70fab 100644 --- a/mysql-test/r/lowercase_table2.result +++ b/mysql-test/r/lowercase_table2.result @@ -56,6 +56,7 @@ CREATE DATABASE `TEST_$1`; SHOW DATABASES LIKE "TEST%"; Database (TEST%) TEST_$1 +test DROP DATABASE `test_$1`; CREATE TABLE T1 (a int) engine=innodb; INSERT INTO T1 VALUES (1); @@ -171,6 +172,6 @@ create table myUC (i int); select TABLE_SCHEMA,TABLE_NAME FROM information_schema.TABLES where TABLE_SCHEMA ='mysqltest_LC2'; TABLE_SCHEMA TABLE_NAME -mysqltest_LC2 myUC +mysqltest_lc2 myUC use test; drop database mysqltest_LC2; 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))) { |