diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-12-20 12:51:57 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-12-20 12:51:57 +0200 |
| commit | 042f763268c0f209e7c12e0a6a72bb5d204dfe29 (patch) | |
| tree | 7ee15ab50af97cab4135f3712f95ac12fafc74c5 /mysql-test/r/func_set.result | |
| parent | cb121a047b55403fe271570c928fd95ed64a1c8f (diff) | |
| parent | 924db8b4ed3f268cbe91a1734611f4dc2311c7be (diff) | |
| download | mariadb-git-042f763268c0f209e7c12e0a6a72bb5d204dfe29.tar.gz | |
Merge remote-tracking branch '5.5' into 10.0
Diffstat (limited to 'mysql-test/r/func_set.result')
| -rw-r--r-- | mysql-test/r/func_set.result | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/mysql-test/r/func_set.result b/mysql-test/r/func_set.result index dfc3faf3fac..2c531ac4d78 100644 --- a/mysql-test/r/func_set.result +++ b/mysql-test/r/func_set.result @@ -221,21 +221,11 @@ NULL DROP TABLE t1; # -# Start of 5.3 tests -# -# -# MDEV-4512 Valgrind warnings in my_long10_to_str_8bit on INTERVAL and DATE_ADD with incorrect types -# -CREATE TABLE t1 (pk INT PRIMARY KEY); -INSERT INTO t1 VALUES (10),(11); -SELECT INTERVAL( 9, 1, DATE_ADD( pk, INTERVAL pk MINUTE_SECOND ), 9, 8, 3, 5, 2, 1 ) FROM t1; -INTERVAL( 9, 1, DATE_ADD( pk, INTERVAL pk MINUTE_SECOND ), 9, 8, 3, 5, 2, 1 ) -8 -8 -Warnings: -Warning 1292 Incorrect datetime value: '10' -Warning 1292 Incorrect datetime value: '11' -DROP TABLE t1; -# -# End of 5.3 tests +# MDEV-14596 Crash in INTERVAL(ROW(..),ROW(..)) # +SELECT INTERVAL(ROW(1,1),ROW(1,2)); +ERROR 21000: Operand should contain 1 column(s) +SELECT INTERVAL(1,ROW(1,2)); +ERROR 21000: Operand should contain 1 column(s) +SELECT INTERVAL(ROW(1,2),1); +ERROR 21000: Operand should contain 1 column(s) |