BUG#28022129: NOW() DOESN'T HONOR NO_ZERO_DATE SQL_MODE

Post push fix for test failure.
mysql · Nov 5, 2018 · ade9927 · ade9927
1 parent d8e9cc0
commit ade9927
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/mysql-test/r/type_temporal_fractional.result b/mysql-test/r/type_temporal_fractional.result
@@ -73,13 +73,13 @@ NOW(0), NOW(1), NOW(2), NOW(3), NOW(4), NOW(5), NOW(6);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `NOW(0)` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `NOW(1)` datetime(1) NOT NULL DEFAULT '0000-00-00 00:00:00.0',
-  `NOW(2)` datetime(2) NOT NULL DEFAULT '0000-00-00 00:00:00.00',
-  `NOW(3)` datetime(3) NOT NULL DEFAULT '0000-00-00 00:00:00.000',
-  `NOW(4)` datetime(4) NOT NULL DEFAULT '0000-00-00 00:00:00.0000',
-  `NOW(5)` datetime(5) NOT NULL DEFAULT '0000-00-00 00:00:00.00000',
-  `NOW(6)` datetime(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000'
+  `NOW(0)` datetime NOT NULL,
+  `NOW(1)` datetime(1) NOT NULL,
+  `NOW(2)` datetime(2) NOT NULL,
+  `NOW(3)` datetime(3) NOT NULL,
+  `NOW(4)` datetime(4) NOT NULL,
+  `NOW(5)` datetime(5) NOT NULL,
+  `NOW(6)` datetime(6) NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 AS SELECT
@@ -89,13 +89,13 @@ SYSDATE(4), SYSDATE(5), SYSDATE(6);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `SYSDATE(0)` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `SYSDATE(1)` datetime(1) NOT NULL DEFAULT '0000-00-00 00:00:00.0',
-  `SYSDATE(2)` datetime(2) NOT NULL DEFAULT '0000-00-00 00:00:00.00',
-  `SYSDATE(3)` datetime(3) NOT NULL DEFAULT '0000-00-00 00:00:00.000',
-  `SYSDATE(4)` datetime(4) NOT NULL DEFAULT '0000-00-00 00:00:00.0000',
-  `SYSDATE(5)` datetime(5) NOT NULL DEFAULT '0000-00-00 00:00:00.00000',
-  `SYSDATE(6)` datetime(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000'
+  `SYSDATE(0)` datetime NOT NULL,
+  `SYSDATE(1)` datetime(1) NOT NULL,
+  `SYSDATE(2)` datetime(2) NOT NULL,
+  `SYSDATE(3)` datetime(3) NOT NULL,
+  `SYSDATE(4)` datetime(4) NOT NULL,
+  `SYSDATE(5)` datetime(5) NOT NULL,
+  `SYSDATE(6)` datetime(6) NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 AS SELECT