merge

9678beb6 · Georgi Kodinov · c10eb6ec · 1a5a1095 · 9678beb6
Commit 9678beb6 authored Nov 02, 2010 by Georgi Kodinov
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

sql/sql_show.cc sql/sql_show.cc +0 -6

No files found.
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -480,12 +480,6 @@ find_files(THD *thd, List<LEX_STRING> *files, const char *db,
 	else if (wild_compare(uname, wild, 0))
 	  continue;
      }
-      if (!(file_name= 
-            thd->make_lex_string(file_name, uname, file_name_len, TRUE)))
-      {
-        my_dirend(dirp);
-        DBUG_RETURN(FIND_FILES_OOM);
-      }
    }
    else
    {