diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-08 21:23:03 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-08 21:23:03 +0100 |
| commit | b0ee31c89480519490537b89dca1e8cc65e2b73b (patch) | |
| tree | ed4d62ba164ba63763704fc41007489910489fc8 /mysql-test/r | |
| parent | 6f26aac9409e3456798e58a4ee4306e43c7ebf7b (diff) | |
| download | mariadb-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')
| -rw-r--r-- | mysql-test/r/datetime_456.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/func_time.result | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/datetime_456.result b/mysql-test/r/datetime_456.result index ba020a250b7..44351a821bc 100644 --- a/mysql-test/r/datetime_456.result +++ b/mysql-test/r/datetime_456.result @@ -4,5 +4,5 @@ insert t1 values (addtime('9999-12-31 23:59:59', '00:00:01')), select * from t1; d NULL -NULL +0000-00-00 00:00:00 drop table t1; 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, # |