bzr commit into mysql-5.1-bugteam branch (Georgi.Kodinov:3550) Bug#51208

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/B51208-5.1-bugteam/ based on revid:gleb.shchepa@stripped

 3550 Georgi Kodinov	2010-11-02
      Bug #51208: Extra string allocation from thd->mem_root 
      in sql_show.cc, find_files()
      
      Removed the extra allocation.

    modified:
      sql/sql_show.cc
=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2010-08-27 07:44:06 +0000
+++ b/sql/sql_show.cc	2010-11-02 13:20:02 +0000
@@ -534,12 +534,6 @@ find_files(THD *thd, List<LEX_STRING> *f
 	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
     {


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