diff options
author | Tor Didriksen <tor.didriksen@oracle.com> | 2011-07-11 11:27:52 +0200 |
---|---|---|
committer | Tor Didriksen <tor.didriksen@oracle.com> | 2011-07-11 11:27:52 +0200 |
commit | c1911979e5000a45ea7716f61cdbee45be3f1d26 (patch) | |
tree | 8ecb7d1d4c9dc01076ed94b5c263a0c8654c1834 /mysql-test/t/union.test | |
parent | 0dc17bc77087380e3bda5c4e53544a11cdc2325f (diff) | |
parent | 08ecbd5adb9051b77dca4cea0988ea286366a409 (diff) | |
download | mariadb-git-c1911979e5000a45ea7716f61cdbee45be3f1d26.tar.gz |
merge 5.1-security => 5.5-security
Diffstat (limited to 'mysql-test/t/union.test')
-rw-r--r-- | mysql-test/t/union.test | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index c6599517e90..f5a5cad77e8 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -1116,6 +1116,47 @@ SELECT * FROM t2 UNION SELECT * FROM t2 DROP TABLE t1,t2; +--echo # +--echo # Bug#11765255 58201: +--echo # VALGRIND/CRASH WHEN ORDERING BY MULTIPLE AGGREGATE FUNCTIONS +--echo # + +let $my_stmt= +select 1 as foo +union +select 2 +union +select 3 +union +select 4 +order by max(42) + max(1) + max(1) + max(1) + max(1) + max(1) +; + +eval $my_stmt; + +eval prepare stmt1 from '$my_stmt'; +execute stmt1; +execute stmt1; + +let $my_stmt= +select 1 as foo +union +select 2 +union +select 3 +union +(select 4) +order by max(42) + max(1) + max(1) + max(1) + max(1) + max(1) +; + +eval $my_stmt; + +eval prepare stmt1 from '$my_stmt'; +execute stmt1; +execute stmt1; + +deallocate prepare stmt1; + --echo End of 5.1 tests --echo # |