From ea7edd4560afdf80d9d8fe48b0a2633c917ce1ee Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Mon, 3 Feb 2014 11:36:16 -0500 Subject: [PATCH] #33 fix mysql test func_time sql_mode (since we changed its default) --- mysql-test/r/func_time.result | 4 +--- mysql-test/t/func_time.test | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 1f827961..a1fd13b0 100644 --- 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 index 2329f702..d4285a74 100644 --- 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)