bzr push into mysql-trunk-bugfixing branch (alexander.nozdrin:3394 to 3395)

[Alexander Nozdrin]

 3395 Alexander Nozdrin	2010-11-25 [merge]
      Merge from mysql-5.5-bugteam.

    modified:
      mysql-test/r/func_time.result
      mysql-test/t/func_time.test
      sql/item_timefunc.cc
 3394 Magnus Blåudd	2010-11-25
      WL#3127 slave side TCP address binding
       - Extend CHANGE MASTER with MASTER_BIND='interface'
       - Extend SHOW SLAVE STATUS with a new column Master_Bind
       - Add testcase

    added:
      mysql-test/extra/rpl_tests/rpl_change_master_bind.inc
    modified:
      mysql-test/extra/rpl_tests/rpl_change_master.test
      mysql-test/include/check_ipv6.inc
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result
      sql/lex.h
      sql/rpl_mi.cc
      sql/rpl_mi.h
      sql/rpl_slave.cc
      sql/sql_lex.h
      sql/sql_yacc.yy
=== modified file 'mysql-test/r/func_time.result'
--- a/mysql-test/r/func_time.result	2010-11-01 09:52:05 +0000
+++ b/mysql-test/r/func_time.result	2010-11-25 12:37:08 +0000
@@ -1372,3 +1372,13 @@ date_date
 SELECT * FROM t1 WHERE date_date <= addtime(date_add("2000-1-1", INTERVAL "1:1:1" HOUR_SECOND), "00:20:00");
 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-11-01 09:52:05 +0000
+++ b/mysql-test/t/func_time.test	2010-11-25 12:37:08 +0000
@@ -873,3 +873,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 10:26:57 +0000
+++ b/sql/item_timefunc.cc	2010-11-25 12:37:08 +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).