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 | eddae7e5435f4b6f4bbfcdc37d390351dcee6962 (patch) | |
| tree | 8bf99e9f04ece5292c895e49ede9a191d11c5610 /mysql-test/r/func_sapdb.result | |
| parent | 6bcc6c2509d6a3f5d6775b62aee3e8d15ae0e373 (diff) | |
| download | mariadb-git-eddae7e5435f4b6f4bbfcdc37d390351dcee6962.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/func_sapdb.result')
| -rw-r--r-- | mysql-test/r/func_sapdb.result | 2 |
1 files changed, 1 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 |