diff options
| author | unknown <mhansson/martin@linux-st28.site> | 2007-10-09 15:00:06 +0200 |
|---|---|---|
| committer | unknown <mhansson/martin@linux-st28.site> | 2007-10-09 15:00:06 +0200 |
| commit | 05903b333f1a783d2f4b1cdc94a1476c23b882b9 (patch) | |
| tree | 1c7bd467dff8a8298074b2fbb68f09769cfe428f /mysql-test/t/func_time.test | |
| parent | bd8e7fee1f260b6f5b9b39c67bb6e701eace3cae (diff) | |
| parent | ae4141ed75124cc4bbae5fa22662ef0e7f00b122 (diff) | |
| download | mariadb-git-05903b333f1a783d2f4b1cdc94a1476c23b882b9.tar.gz | |
Merge linux-st28.site:/home/martin/mysql/src/bug31160/my50-bug31160
into linux-st28.site:/home/martin/mysql/src/bug31160/my51-bug31160
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
sql/item_timefunc.h:
Auto merged
mysql-test/t/func_time.test:
SCCS merged
Diffstat (limited to 'mysql-test/t/func_time.test')
| -rw-r--r-- | mysql-test/t/func_time.test | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index d3346bbb880..5c1a5c2200b 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -548,6 +548,16 @@ DROP TABLE testBug8868; SET NAMES DEFAULT; # +# Bug #31160: MAKETIME() crashes server when returning NULL in ORDER BY using +# filesort +# +CREATE TABLE t1 ( + a TIMESTAMP +); +INSERT INTO t1 VALUES (now()), (now()); +SELECT 1 FROM t1 ORDER BY MAKETIME(1, 1, a); +DROP TABLE t1; +# # Bug #19844 time_format in Union truncates values # |