merged 5.0-bugteam -> 5.1-bugteam

1 files changed, 4 insertions, 13 deletions

diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index cceba8a4935..3c4dc103ddd 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -468,17 +468,11 @@ find_files(THD *thd, List<LEX_STRING> *files, const char *db,
 #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));
@@ -543,11 +537,8 @@ find_files(THD *thd, List<LEX_STRING> *files, const char *db,
       {
 	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;
+	  if (wild_case_compare(files_charset_info, uname, wild))
+	    continue;
 	}
 	else if (wild_compare(uname, wild, 0))
 	  continue;