From: Alexander Nozdrin
Date: November 25 2010 11:50am
Subject: bzr push into mysql-5.5-bugteam branch (alexander.nozdrin:3138 to 3141)
List-Archive: http://lists.mysql.com/commits/125015
Message-Id: <201011251151.oAPBpw7b007201@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3141 Alexander Nozdrin	2010-11-25 [merge]
      Null-merge from mysql-5.5.7-rc-release (changes are here already).

 3140 Alexander Nozdrin	2010-11-25 [merge]
      Empty merge from mysql-5.5.7-rc-release.

 3139 Alexander Nozdrin	2010-11-25 [merge]
      Auto-merge from mysql-5.5.7-rc-release.

    modified:
      mysql-test/r/func_time.result
      mysql-test/t/func_time.test
      sql/item_timefunc.cc
 3138 Tatiana Azundris Nurnberg	2010-11-25 [merge]
      merge

=== modified file 'mysql-test/r/func_time.result'
--- a/mysql-test/r/func_time.result	2010-10-31 23:23:37 +0000
+++ b/mysql-test/r/func_time.result	2010-11-25 11:33:11 +0000
@@ -1341,3 +1341,12 @@ SELECT * FROM t1 WHERE date_date <= addt
 date_date
 DROP TABLE t1;
 #
+# Bug#57512 str_to_date crash...
+#
+SELECT WEEK(STR_TO_DATE(NULL,0));
+WEEK(STR_TO_DATE(NULL,0))
+NULL
+SELECT SUBDATE(STR_TO_DATE(NULL,0), INTERVAL 1 HOUR);
+SUBDATE(STR_TO_DATE(NULL,0), INTERVAL 1 HOUR)
+NULL
+#

=== modified file 'mysql-test/t/func_time.test'
--- a/mysql-test/t/func_time.test	2010-10-31 23:23:37 +0000
+++ b/mysql-test/t/func_time.test	2010-11-25 11:33:11 +0000
@@ -852,5 +852,13 @@ INSERT INTO t1 VALUES ('2008-01-03 00:00
 SELECT * FROM t1 WHERE date_date >= subtime(now(), "00:30:00");
 SELECT * FROM t1 WHERE date_date <= addtime(date_add("2000-1-1", INTERVAL "1:1:1" HOUR_SECOND), "00:20:00");
 DROP TABLE t1;
+
+--echo #
+--echo # Bug#57512 str_to_date crash...
+--echo #
+
+SELECT WEEK(STR_TO_DATE(NULL,0));
+SELECT SUBDATE(STR_TO_DATE(NULL,0), INTERVAL 1 HOUR);
+
 --echo #
 

=== modified file 'sql/item_timefunc.cc'
--- a/sql/item_timefunc.cc	2010-10-07 08:17:08 +0000
+++ b/sql/item_timefunc.cc	2010-10-20 13:17:29 +0000
@@ -3465,7 +3465,7 @@ bool Item_func_str_to_date::get_date(MYS
   return 0;
 
 null_date:
-  if (fuzzy_date & TIME_NO_ZERO_DATE)
+  if (val && (fuzzy_date & TIME_NO_ZERO_DATE))
   {
     char buff[128];
     strmake(buff, val->ptr(), min(val->length(), sizeof(buff)-1));

No bundle (reason: useless for push emails).