bzr push into mysql-trunk-merge branch (Georgi.Kodinov:3139 to 3140)

[Georgi Kodinov]

 3140 Georgi Kodinov	2010-07-21 [merge]
      merge

    modified:
      mysql-test/r/lowercase_table2.result
      sql/sql_show.cc
 3139 Alexey Kopytov	2010-07-21 [merge]
      Automerge.

    modified:
      sql/mysqld.cc
=== modified file 'mysql-test/r/lowercase_table2.result'
--- a/mysql-test/r/lowercase_table2.result	2010-06-28 09:23:50 +0000
+++ b/mysql-test/r/lowercase_table2.result	2010-07-21 15:20:29 +0000
@@ -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,7 +172,7 @@ 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;
 # End of 5.1 tests

=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2010-07-20 19:30:10 +0000
+++ b/sql/sql_show.cc	2010-07-21 15:20:29 +0000
@@ -460,8 +460,19 @@ find_files(THD *thd, List<LEX_STRING> *f
         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)))
       {


Attachment: [text/bzr-bundle] bzr/[e-mail]