From: Alexander Barkov
Date: February 2 2012 12:38pm
Subject: bzr push into mysql-trunk branch (alexander.barkov:3829 to 3830) Bug#13458237
List-Archive: http://lists.mysql.com/commits/142724
X-Bug: 13458237
Message-Id: <201202021241.q12CfLQx008891@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3830 Alexander Barkov	2012-02-02
      Post-fix for BUG#13458237.
      Recording correct test results.

    modified:
      mysql-test/suite/engines/funcs/r/date_function.result
 3829 Alexander Barkov	2012-02-02 [merge]
      Merging from mysql-trunk

    modified:
      mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result
=== modified file 'mysql-test/suite/engines/funcs/r/date_function.result'
--- a/mysql-test/suite/engines/funcs/r/date_function.result	2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/r/date_function.result	2012-02-02 12:37:31 +0000
@@ -306,6 +306,8 @@ NULL
 2000-01-31
 2006-12-31
 2008-02-29
+Warnings:
+Warning	1292	Incorrect datetime value: '0000-00-00'
 DROP TABLE t3;
 CREATE TABLE t3(c1 DATE NOT NULL);
 INSERT INTO t3 VALUES('1000-01-01');

No bundle (reason: useless for push emails).