summaryrefslogtreecommitdiff
path: root/mysql-test/r/order_by.result
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2011-07-11 11:27:52 +0200
committerTor Didriksen <tor.didriksen@oracle.com>2011-07-11 11:27:52 +0200
commitc1911979e5000a45ea7716f61cdbee45be3f1d26 (patch)
tree8ecb7d1d4c9dc01076ed94b5c263a0c8654c1834 /mysql-test/r/order_by.result
parent0dc17bc77087380e3bda5c4e53544a11cdc2325f (diff)
parent08ecbd5adb9051b77dca4cea0988ea286366a409 (diff)
downloadmariadb-git-c1911979e5000a45ea7716f61cdbee45be3f1d26.tar.gz
merge 5.1-security => 5.5-security
Diffstat (limited to 'mysql-test/r/order_by.result')
-rw-r--r--mysql-test/r/order_by.result7
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/order_by.result b/mysql-test/r/order_by.result
index 1e65f889ea0..9ad8e940fe5 100644
--- a/mysql-test/r/order_by.result
+++ b/mysql-test/r/order_by.result
@@ -1665,6 +1665,13 @@ a 1
3 1
2 1
DROP TABLE t1;
+#
+# Bug#11765255 58201:
+# VALGRIND/CRASH WHEN ORDERING BY MULTIPLE AGGREGATE FUNCTIONS
+#
+select 1 order by max(1) + min(1);
+1
+1
End of 5.1 tests
#
# Bug #38745: MySQL 5.1 optimizer uses filesort for ORDER BY