summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_time.result
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-01-08 21:23:03 +0100
committerSergei Golubchik <sergii@pisem.net>2013-01-08 21:23:03 +0100
commitb0ee31c89480519490537b89dca1e8cc65e2b73b (patch)
treeed4d62ba164ba63763704fc41007489910489fc8 /mysql-test/r/func_time.result
parent6f26aac9409e3456798e58a4ee4306e43c7ebf7b (diff)
downloadmariadb-git-b0ee31c89480519490537b89dca1e8cc65e2b73b.tar.gz
MDEV-3942 FROM_DAYS(<timestamp column>) returns different result in MariaDB comparing to MySQL: NULL vs 0000-00-00
fixed a regression, introduced while fixing MDEV-456
Diffstat (limited to 'mysql-test/r/func_time.result')
-rw-r--r--mysql-test/r/func_time.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
index 2df0c691083..14d2729e952 100644
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/r/func_time.result
@@ -1453,7 +1453,7 @@ MAKEDATE(11111111,1)
NULL
SELECT WEEK(DATE_ADD(FROM_DAYS(1),INTERVAL 1 MONTH), 1);
WEEK(DATE_ADD(FROM_DAYS(1),INTERVAL 1 MONTH), 1)
-NULL
+0
#
# Bug#12584302 AFTER FIX FOR #12403504: ASSERTION FAILED: DELSUM+(INT) Y/4-TEMP > 0,
#