bzr push into mysql-trunk branch (sergey.glukhov:3328 to 3329)

[Sergey Glukhov]

 3329 Sergey Glukhov	2011-03-28 [merge]
      5.5->trunk merge
     @ mysql-test/r/func_time.result
        5.5->trunk merge
     @ mysql-test/suite/rpl/t/rpl_semi_sync_event.test
        5.5->trunk merge
     @ mysql-test/t/func_time.test
        5.5->trunk merge
     @ sql/item_timefunc.cc
        5.5->trunk merge

    modified:
      mysql-test/r/func_time.result
      mysql-test/suite/rpl/t/rpl_semi_sync_event.test
      mysql-test/t/func_time.test
      sql/item_timefunc.cc
 3328 Sven Sandberg	2011-03-25 [merge]
      Merged BUG#11766427, BUG#59539 from 5.5 to trunk.
      No conflicts.

    modified:
      client/mysqlbinlog.cc
      mysql-test/r/mysqlbinlog.result
      mysql-test/t/mysqlbinlog.test
=== modified file 'mysql-test/r/func_time.result'
--- a/mysql-test/r/func_time.result	2011-03-17 09:47:50 +0000
+++ b/mysql-test/r/func_time.result	2011-03-28 08:10:39 +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#43578 "MyISAM&Maria gives wrong rows with range access

=== modified file 'mysql-test/suite/rpl/t/rpl_semi_sync_event.test'
--- a/mysql-test/suite/rpl/t/rpl_semi_sync_event.test	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_event.test	2011-03-25 15:28:11 +0000
@@ -15,6 +15,7 @@ call mtr.add_suppression("Unsafe stateme
 connection slave;
 call mtr.add_suppression("Master server does not support semi-sync");
 call mtr.add_suppression("Semi-sync slave .* reply");
+call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group");
 enable_query_log;
 
 connection master;

=== modified file 'mysql-test/t/func_time.test'
--- a/mysql-test/t/func_time.test	2011-03-17 09:47:50 +0000
+++ b/mysql-test/t/func_time.test	2011-03-28 08:10:39 +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-03-22 11:44:40 +0000
+++ b/sql/item_timefunc.cc	2011-03-28 08:10:39 +0000
@@ -311,8 +311,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).