summaryrefslogtreecommitdiff
path: root/mysql-test/t/func_if.test
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-02-23 14:06:41 +0200
committerMichael Widenius <monty@askmonty.org>2010-02-23 14:06:41 +0200
commit2840821cc92c302c9172ef6d47c484b5bdfcc785 (patch)
tree8007fd53899c68e7a44fbcc5e1e11dc9b8e8895c /mysql-test/t/func_if.test
parent2df35ba9a1ce6683342c95740ffc09f39f1dde2a (diff)
downloadmariadb-git-2840821cc92c302c9172ef6d47c484b5bdfcc785.tar.gz
Fixed LP#524679: make test ORDER BY date_ord ASC
(Problem was missing time_zone setting)
Diffstat (limited to 'mysql-test/t/func_if.test')
-rw-r--r--mysql-test/t/func_if.test11
1 files changed, 10 insertions, 1 deletions
diff --git a/mysql-test/t/func_if.test b/mysql-test/t/func_if.test
index 4efea8e195e..8142f57c0de 100644
--- a/mysql-test/t/func_if.test
+++ b/mysql-test/t/func_if.test
@@ -5,6 +5,11 @@
drop table if exists t1;
--enable_warnings
+--disable_query_log
+# Set timezone to something specific, to make it possible to use unix_timestamp
+set time_zone="+03:00";
+--enable_query_log
+
#
# Simple IF tests
#
@@ -163,5 +168,9 @@ SELECT * FROM (SELECT MAX(IFNULL(CAST(c AS UNSIGNED), 0)) FROM t1) AS te;
DROP TABLE t1;
-
--echo End of 5.0 tests
+
+--disable_query_log
+# Restore timezone to default
+set time_zone= @@global.time_zone;
+--enable_query_log