diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-05-21 16:52:12 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-05-21 16:52:12 +0400 |
| commit | a999acf26ecbe815f9b10780153384bea7840a03 (patch) | |
| tree | aa3a866129d7373454c4054d31f394edd36d87c4 /mysql-test/t/parser.test | |
| parent | 349da1d643e6d56ba1e3e6edd3f5fcb3fddc5dee (diff) | |
| download | mariadb-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/t/parser.test')
| -rw-r--r-- | mysql-test/t/parser.test | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/t/parser.test b/mysql-test/t/parser.test index ae456574c39..7d1582c397c 100644 --- a/mysql-test/t/parser.test +++ b/mysql-test/t/parser.test @@ -951,7 +951,7 @@ let $q=SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1; eval $q; --error ER_WRONG_USAGE eval SELECT ($q); ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR eval SELECT 1 FROM ($q) a; let $q=SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1; @@ -959,7 +959,7 @@ let $q=SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1; eval $q; --error ER_WRONG_USAGE eval SELECT ($q); ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR eval SELECT 1 FROM ($q) a; let $q=SELECT 1 FROM t1 ORDER BY 1 LIMIT 1 UNION SELECT 1 FROM t1; @@ -967,7 +967,7 @@ let $q=SELECT 1 FROM t1 ORDER BY 1 LIMIT 1 UNION SELECT 1 FROM t1; eval $q; --error ER_WRONG_USAGE eval SELECT ($q); ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR eval SELECT 1 FROM ($q) a; let $q=SELECT 1 FROM t1 LIMIT 1 ORDER BY 1 UNION SELECT 1 FROM t1; @@ -983,7 +983,7 @@ let $q=SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 ORDER BY 1; eval $q; --error ER_WRONG_USAGE eval SELECT ($q); ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR eval SELECT 1 FROM ($q) a; let $q=SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 LIMIT 1; @@ -991,7 +991,7 @@ let $q=SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 LIMIT 1; eval $q; --error ER_WRONG_USAGE eval SELECT ($q); ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR eval SELECT 1 FROM ($q) a; let $q=SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 ORDER BY 1; @@ -999,7 +999,7 @@ let $q=SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 ORDER BY 1; eval $q; --error ER_WRONG_USAGE eval SELECT ($q); ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR eval SELECT 1 FROM ($q) a; let $q=SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 LIMIT 1; @@ -1007,7 +1007,7 @@ let $q=SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 LIMIT 1; eval $q; --error ER_WRONG_USAGE eval SELECT ($q); ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR eval SELECT 1 FROM ($q) a; DROP TABLE t1; |