diff options
| author | unknown <mhansson/martin@linux-st28.site> | 2007-10-09 14:58:09 +0200 |
|---|---|---|
| committer | unknown <mhansson/martin@linux-st28.site> | 2007-10-09 14:58:09 +0200 |
| commit | ae4141ed75124cc4bbae5fa22662ef0e7f00b122 (patch) | |
| tree | 8bf99e9f04ece5292c895e49ede9a191d11c5610 /mysql-test/r | |
| parent | 692b686dae872c4d93f472d11d16eb8807076f98 (diff) | |
| download | mariadb-git-ae4141ed75124cc4bbae5fa22662ef0e7f00b122.tar.gz | |
Bug#31160: MAKETIME() crashes server when returning NULL in ORDER BY using filesort
Even though it returns NULL, the MAKETIME function did not have this property set,
causing a failed assertion (designed to catch exactly this).
Fixed by setting the nullability property of MAKETIME().
mysql-test/r/func_sapdb.result:
Bug#31160: Changed test result.
mysql-test/r/func_time.result:
Bug#31160: Test result.
mysql-test/t/func_time.test:
Bug#31160: Test case.
sql/item_timefunc.h:
Bug#31160: The fix: Initializing maybe_null to true
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/func_sapdb.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/func_time.result | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/mysql-test/r/func_sapdb.result b/mysql-test/r/func_sapdb.result index dbae7e551e5..e2ed9c98adc 100644 --- a/mysql-test/r/func_sapdb.result +++ b/mysql-test/r/func_sapdb.result @@ -196,7 +196,7 @@ f2 datetime YES NULL f3 time YES NULL f4 time YES NULL f5 time YES NULL -f6 time NO 00:00:00 +f6 time YES NULL f7 datetime YES NULL f8 date YES NULL f9 time YES NULL diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index ee8b8c1e908..74859be4d04 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -1027,6 +1027,15 @@ fmtddate field2 Sep-4 12:00AM abcd DROP TABLE testBug8868; SET NAMES DEFAULT; +CREATE TABLE t1 ( +a TIMESTAMP +); +INSERT INTO t1 VALUES (now()), (now()); +SELECT 1 FROM t1 ORDER BY MAKETIME(1, 1, a); +1 +1 +1 +DROP TABLE t1; (select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H) union (select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H); |