summaryrefslogtreecommitdiff
path: root/mysql-test/t/group_by.test
diff options
context:
space:
mode:
authorunknown <sanja@montyprogram.com>2013-10-29 18:50:36 +0200
committerunknown <sanja@montyprogram.com>2013-10-29 18:50:36 +0200
commit52dea41052bc1be1efbe59c320046d7e62cfd0a6 (patch)
tree515c69dbce80f1af73974286de8f87413b1cad23 /mysql-test/t/group_by.test
parent86901216fd4f7eb0844e884203810a0e43fcd103 (diff)
parent5ce11d8b4ca2a57968656925a69ed8114d5374f6 (diff)
downloadmariadb-git-52dea41052bc1be1efbe59c320046d7e62cfd0a6.tar.gz
Merge 5.3->5.5
Diffstat (limited to 'mysql-test/t/group_by.test')
-rw-r--r--mysql-test/t/group_by.test7
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test
index 4b7a475eb28..1ef514d591d 100644
--- a/mysql-test/t/group_by.test
+++ b/mysql-test/t/group_by.test
@@ -1593,6 +1593,13 @@ set optimizer_switch=@save_optimizer_switch;
DROP TABLE t1,t2;
+--echo #
+--echo # MDEV-5104 crash in Item_field::used_tables with broken order by
+--echo #
+
+--error ER_BAD_FIELD_ERROR
+(select 1 order by x(y)) order by 1;
+
--echo # End of 5.3 tests
--echo #