bzr push into mysql-5.0-bugteam branch (joro:2722 to 2723) Bug#25830

[Georgi Kodinov]

 2723 Georgi Kodinov	2009-01-05
      Reverted the fix for bug #25830 because of omissions and non-complete test
      case.
removed:
  mysql-test/r/lowercase_utf8.result
  mysql-test/t/lowercase_utf8-master.opt
  mysql-test/t/lowercase_utf8.test
modified:
  sql/sql_show.cc

 2722 Tatiana A. Nurnberg	2008-12-30 [merge]
      auto-merge
added:
  mysql-test/r/lowercase_utf8.result
  mysql-test/t/lowercase_utf8-master.opt
  mysql-test/t/lowercase_utf8.test
modified:
  client/mysql.cc
  configure.in
  include/config-win.h
  include/m_ctype.h
  include/my_global.h
  innobase/btr/btr0cur.c
  innobase/btr/btr0sea.c
  innobase/dict/dict0dict.c
  innobase/include/btr0sea.h
  innobase/include/ut0ut.h
  innobase/srv/srv0srv.c
  innobase/srv/srv0start.c
  innobase/ut/ut0ut.c
  myisam/ft_boolean_search.c
  mysql-test/mysql-test-run.pl
  mysql-test/r/alter_table.result
  mysql-test/r/binlog_index.result
  mysql-test/r/csv.result
  mysql-test/r/ctype_ucs.result
  mysql-test/r/explain.result
  mysql-test/r/fulltext.result
  mysql-test/r/func_if.result
  mysql-test/r/func_str.result
  mysql-test/r/func_time.result
  mysql-test/r/grant.result
  mysql-test/r/index_merge.result
  mysql-test/r/mysql.result
  mysql-test/r/rpl_packet.result
  mysql-test/r/select.result
  mysql-test/r/status.result
  mysql-test/r/type_bit.result
  mysql-test/r/type_float.result
  mysql-test/t/alter_table.test
  mysql-test/t/csv.test
  mysql-test/t/ctype_ucs.test
  mysql-test/t/explain.test
  mysql-test/t/fulltext.test
  mysql-test/t/func_if.test
  mysql-test/t/func_str.test
  mysql-test/t/func_time.test
  mysql-test/t/grant.test
  mysql-test/t/index_merge.test
  mysql-test/t/mysql.test
  mysql-test/t/rpl_packet.test
  mysql-test/t/select.test
  mysql-test/t/status.test
  mysql-test/t/type_bit.test
  mysql-test/t/type_float.test
  sql/examples/ha_tina.cc
  sql/field.cc
  sql/ha_innodb.cc
  sql/item.cc
  sql/item_func.h
  sql/item_strfunc.h
  sql/item_sum.cc
  sql/item_sum.h
  sql/item_timefunc.cc
  sql/item_timefunc.h
  sql/log.cc
  sql/mysql_priv.h
  sql/mysqld.cc
  sql/opt_range.cc
  sql/opt_sum.cc
  sql/set_var.cc
  sql/sql_acl.cc
  sql/sql_class.h
  sql/sql_cursor.cc
  sql/sql_locale.cc
  sql/sql_select.cc
  sql/sql_select.h
  sql/sql_show.cc
  sql/sql_table.cc
  sql/structs.h
  strings/ctype.c
  tests/mysql_client_test.c

=== removed file 'mysql-test/r/lowercase_utf8.result'
--- a/mysql-test/r/lowercase_utf8.result	2008-12-24 15:01:41 +0000
+++ b/mysql-test/r/lowercase_utf8.result	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-set names utf8;
-create table `Ö` (id int);
-show tables from test like 'Ö';
-Tables_in_test (Ö)
-ö
-show tables from test like 'ö';
-Tables_in_test (ö)
-ö
-drop table `Ö`;

=== removed file 'mysql-test/t/lowercase_utf8-master.opt'
--- a/mysql-test/t/lowercase_utf8-master.opt	2008-12-24 15:01:41 +0000
+++ b/mysql-test/t/lowercase_utf8-master.opt	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
---lower-case-table-names=1 --character-set-server=utf8
-
-
-

=== removed file 'mysql-test/t/lowercase_utf8.test'
--- a/mysql-test/t/lowercase_utf8.test	2008-12-24 15:01:41 +0000
+++ b/mysql-test/t/lowercase_utf8.test	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#
-# Bug#25830 SHOW TABLE STATUS behaves differently depending on table name
-#
-set names utf8;
-create table `Ö` (id int);
-show tables from test like 'Ö';
-show tables from test like 'ö';
-drop table `Ö`;
-

=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2008-12-29 12:06:53 +0000
+++ b/sql/sql_show.cc	2009-01-05 10:37:56 +0000
@@ -287,17 +287,11 @@ find_files(THD *thd, List<char> *files, 
 #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, 
       {
 	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;