diff options
author | Sergei Golubchik <sergii@pisem.net> | 2010-11-05 10:59:51 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2010-11-05 10:59:51 +0100 |
commit | bc2e383e4a0dbc1949d5b65102e843c01237e23c (patch) | |
tree | 23bb774ead6f6cc840c11c0536f3f59c5d417aca /mysql-test/r/join.result | |
parent | 4cce72a9292c98fab5628adc24c1635e315444e7 (diff) | |
parent | 4cfa91f42c4cde9c35979cd2b9837cb60213d876 (diff) | |
download | mariadb-git-bc2e383e4a0dbc1949d5b65102e843c01237e23c.tar.gz |
mysql-5.1 -> mysql-5.5 merge
Diffstat (limited to 'mysql-test/r/join.result')
-rw-r--r-- | mysql-test/r/join.result | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result index 260f7170fc5..a7f1b5b64f1 100644 --- a/mysql-test/r/join.result +++ b/mysql-test/r/join.result @@ -1185,4 +1185,40 @@ NULL NULL 1 DROP TABLE t1, t2, mm1; +# +# Bug #54468: crash after item's print() function when ordering/grouping +# by subquery +# +CREATE TABLE t1(a INT, b INT); +INSERT INTO t1 VALUES (), (); +SELECT 1 FROM t1 +GROUP BY +GREATEST(t1.a, +(SELECT 1 FROM +(SELECT t1.b FROM t1,t1 t2 +ORDER BY t1.a, t1.a LIMIT 1) AS d) +); +1 +1 +DROP TABLE t1; +# +# Bug #53544: Server hangs during JOIN query in stored procedure called +# twice in a row +# +CREATE TABLE t1(c INT); +INSERT INTO t1 VALUES (1), (2); +PREPARE stmt FROM "SELECT t2.c AS f1 FROM t1 LEFT JOIN + t1 t2 ON t1.c=t2.c RIGHT JOIN + t1 t3 ON t1.c=t3.c + GROUP BY f1;"; +EXECUTE stmt; +f1 +1 +2 +EXECUTE stmt; +f1 +1 +2 +DEALLOCATE PREPARE stmt; +DROP TABLE t1; End of 5.1 tests |