#33 fix mysql test func_time sql_mode (since we changed its default)

Tokutek · Nov 5, 2014 · ea7edd4 · ea7edd4
1 parent 40b50d7
commit ea7edd4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
@@ -2471,15 +2471,13 @@ SELECT * FROM t1;
 TIMESTAMP('00:00:00','10:10:10')	TIMESTAMP(TIME('00:00:00'),'10:10:10')
 NULL	NULL
 DROP TABLE t1;
+SET GLOBAL SQL_MODE=DEFAULT;
 #
 # MDEV-4869 Wrong result of MAKETIME(0, 0, -0.1)
 #
 SELECT MAKETIME(0, 0, -0.1);
 MAKETIME(0, 0, -0.1)
 NULL
-
-SET GLOBAL SQL_MODE='';
-
 #
 # MDEV-4857 Wrong result of HOUR('1 00:00:00')
 #

diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test
@@ -1510,7 +1510,7 @@ SHOW COLUMNS FROM t1;
 SELECT * FROM t1;
 DROP TABLE t1;
 
-SET GLOBAL SQL_MODE='';
+SET GLOBAL SQL_MODE=DEFAULT;
 
 --echo #
 --echo # MDEV-4869 Wrong result of MAKETIME(0, 0, -0.1)