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

[Georgi Kodinov]

 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
 3549 Gleb Shchepa	2010-10-31
      Bug #52160: crash and inconsistent results when grouping
                  by a function and column
      
      The bugreport reveals two different bugs about grouping
      on a function:
      
      1) grouping by the TIME_TO_SEC function result caused
         a server crash or wrong results and
      2) grouping by the function returning a blob caused
         an unexpected "Duplicate entry" error and wrong
         result.
      
      Details for the 1st bug:
      
      TIME_TO_SEC() returns NULL if its argument is invalid (empty
      string for example). Thus its nullability depends not only
      on the nullability of its arguments but also on their values.
      Fixed by (overoptimistically) setting TIME_TO_SEC() to be
      nullable despite the nullability of its arguments.
      
      Details for the 2nd bug:
      
      The server is unable to create indices on blobs without
      explicit blob key part length. However, this fact was
      ignored for blob function result fields of GROUP BY
      intermediate tables.
      Fixed by disabling GROUP BY index creation for blob
      function result fields like regular blob fields.
     @ mysql-test/r/func_time.result
        Test case for bug #52160.
     @ mysql-test/r/type_blob.result
        Test case for bug #52160.
     @ mysql-test/t/func_time.test
        Test case for bug #52160.
     @ mysql-test/t/type_blob.test
        Test case for bug #52160.
     @ sql/item_timefunc.h
        Bug #52160: crash and inconsistent results when grouping
                    by a function and column
        
        TIME_TO_SEC() returns NULL if its argument is invalid (empty
        string for example). Thus its nullability depends not only
        Fixed by (overoptimistically) setting TIME_TO_SEC() to be
        nullable despite the nullability of its arguments.
     @ sql/sql_select.cc
        Bug #52160: crash and inconsistent results when grouping
                    by a function and column
        
        The server is unable to create indices on blobs without
        explicit blob key part length. However, this fact was
        ignored for blob function result fields of GROUP BY
        intermediate tables.
        Fixed by disabling GROUP BY index creation for blob
        function result fields like regular blob fields.

    modified:
      mysql-test/r/func_time.result
      mysql-test/r/type_blob.result
      mysql-test/t/func_time.test
      mysql-test/t/type_blob.test
      sql/item_timefunc.h
      sql/sql_select.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
     {

No bundle (reason: useless for push emails).