summaryrefslogtreecommitdiff
path: root/mysql-test/r/join.result
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2016-05-21 16:52:12 +0400
committerAlexander Barkov <bar@mariadb.org>2016-05-21 16:52:12 +0400
commita999acf26ecbe815f9b10780153384bea7840a03 (patch)
treeaa3a866129d7373454c4054d31f394edd36d87c4 /mysql-test/r/join.result
parent349da1d643e6d56ba1e3e6edd3f5fcb3fddc5dee (diff)
downloadmariadb-git-a999acf26ecbe815f9b10780153384bea7840a03.tar.gz
MDEV-10095 Fix derived tables to return a syntax error instead of "Illegal usage of UNION and LIMIT"
Diffstat (limited to 'mysql-test/r/join.result')
-rw-r--r--mysql-test/r/join.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result
index e7292e8ddce..536fd4ab97f 100644
--- a/mysql-test/r/join.result
+++ b/mysql-test/r/join.result
@@ -1476,7 +1476,7 @@ DROP TABLE t1,t2,t3,t4,t5;
# MDEV-4752: Segfault during parsing of illegal query
#
SELECT * FROM t5 JOIN (t1 JOIN t2 UNION SELECT * FROM t3 JOIN t4);
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT * FROM t3 JOIN t4)' at line 1
#
# MDEV-4959: join of const table with NULL fields
#