diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-03-17 07:41:22 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-03-17 07:41:22 +0100 |
| commit | 019f7425b70bb992bf6446a3c9a1dda041a4440d (patch) | |
| tree | 16373a6476dcbace09c29dcf2155092dd37a781c /mysql-test/r/func_sapdb.result | |
| parent | 926b0f54c9b0f261460e886969dde9bbf1916852 (diff) | |
| download | mariadb-git-019f7425b70bb992bf6446a3c9a1dda041a4440d.tar.gz | |
MDEV-4281 Assertion `maybe_null && item->null_value' fails in make_sortkey on CASE with different return types, GROUP_CONCAT, GROUP BY
Fix Item::get_date() to mark the item NULL when returning an error.
Diffstat (limited to 'mysql-test/r/func_sapdb.result')
| -rw-r--r-- | mysql-test/r/func_sapdb.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/func_sapdb.result b/mysql-test/r/func_sapdb.result index f0c1abd84fe..5bd3b3f8fda 100644 --- a/mysql-test/r/func_sapdb.result +++ b/mysql-test/r/func_sapdb.result @@ -168,7 +168,7 @@ date("1997-12-31 23:59:59.000001") 1997-12-31 select date("1997-13-31 23:59:59.000001"); date("1997-13-31 23:59:59.000001") -NULL +0000-00-00 Warnings: Warning 1292 Incorrect datetime value: '1997-13-31 23:59:59.000001' select time("1997-12-31 23:59:59.000001"); @@ -176,7 +176,7 @@ time("1997-12-31 23:59:59.000001") 23:59:59.000001 select time("1997-12-31 25:59:59.000001"); time("1997-12-31 25:59:59.000001") -NULL +00:00:00 Warnings: Warning 1292 Truncated incorrect time value: '1997-12-31 25:59:59.000001' select microsecond("1997-12-31 23:59:59.000001"); |