bzr push into mysql-5.5-bugteam branch (Georgi.Kodinov:3113 to 3114)

[Georgi Kodinov]

 3114 Georgi Kodinov	2010-11-02 [merge]
      merge

    modified:
      sql/sql_show.cc
 3113 Jon Olav Hauglid	2010-11-01
      Backport from mysql-trunk-bugfixing of:
      
      ------------------------------------------------------------
      revno: 3309
      committer: Tor Didriksen <tor.didriksen@stripped>
      branch nick: trunk-bugfixing
      timestamp: Mon 2010-11-01 08:58:27 +0100
      message:
        Bug#45288: pb2 returns a lot of compilation warnings
        
        DBG build broken on binary-werror-linux-x86_64-tar-gz
        storage/innobase/os/os0sync.c:659: warning: 'timed_out' may be used uninitialized in this function

    modified:
      storage/innobase/os/os0sync.c
=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2010-10-27 07:32:26 +0000
+++ b/sql/sql_show.cc	2010-11-02 14:02:16 +0000
@@ -480,12 +480,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
     {

No bundle (reason: useless for push emails).