From: Sergey Glukhov
Date: March 28 2011 8:12am
Subject: bzr push into mysql-5.5 branch (sergey.glukhov:3403 to 3404)
List-Archive: http://lists.mysql.com/commits/133973
Message-Id: <201103280814.p2S8ES3J009137@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3404 Sergey Glukhov	2011-03-28 [merge]
      5.1->5.5 merge
     @ mysql-test/r/func_time.result
        5.1->5.5 merge
     @ mysql-test/t/func_time.test
        5.1->5.5 merge
     @ sql/item_timefunc.cc
        5.1->5.5 merge

    modified:
      mysql-test/r/func_time.result
      mysql-test/t/func_time.test
      sql/item_timefunc.cc
 3403 Alfranio Correia	2011-03-25
      Fixing test case that is sporadically failing.

    modified:
      mysql-test/suite/rpl/t/rpl_semi_sync_event.test
=== modified file 'mysql-test/r/func_time.result'
--- a/mysql-test/r/func_time.result	2011-03-16 14:11:20 +0000
+++ b/mysql-test/r/func_time.result	2011-03-28 08:03:53 +0000
@@ -1347,6 +1347,12 @@ Warning	1292	Truncated incorrect time va
 Warning	1292	Truncated incorrect time value: ''
 Warning	1292	Truncated incorrect time value: ''
 DROP TABLE t1;
+#
+# Bug#11766112  59151:UNINITIALIZED VALUES IN EXTRACT_DATE_TIME WITH STR_TO_DATE(SPACE(..) ...
+#
+SELECT STR_TO_DATE(SPACE(2),'1');
+STR_TO_DATE(SPACE(2),'1')
+0000-00-00
 End of 5.1 tests
 #
 # Bug#57039: constant subtime expression returns incorrect result.

=== modified file 'mysql-test/t/func_time.test'
--- a/mysql-test/t/func_time.test	2011-03-16 14:11:20 +0000
+++ b/mysql-test/t/func_time.test	2011-03-28 08:03:53 +0000
@@ -862,6 +862,12 @@ INSERT INTO t1 VALUES (''),('');
 SELECT COUNT(*) FROM t1 GROUP BY TIME_TO_SEC(a);
 DROP TABLE t1;
 
+--echo #
+--echo # Bug#11766112  59151:UNINITIALIZED VALUES IN EXTRACT_DATE_TIME WITH STR_TO_DATE(SPACE(..) ...
+--echo #
+
+SELECT STR_TO_DATE(SPACE(2),'1');
+
 --echo End of 5.1 tests
 
 --echo #

=== modified file 'sql/item_timefunc.cc'
--- a/sql/item_timefunc.cc	2011-02-18 08:10:30 +0000
+++ b/sql/item_timefunc.cc	2011-03-28 08:03:53 +0000
@@ -315,8 +315,8 @@ static bool extract_date_time(DATE_TIME_
   for (; ptr != end && val != val_end; ptr++)
   {
     /* Skip pre-space between each argument */
-    while (val != val_end && my_isspace(cs, *val))
-      val++;
+    if ((val+= cs->cset->scan(cs, val, val_end, MY_SEQ_SPACES)) >= val_end)
+      break;
 
     if (*ptr == '%' && ptr+1 != end)
     {

No bundle (reason: useless for push emails).