diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-05-23 10:54:09 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-05-23 10:54:09 +0400 |
| commit | 4c0e2960d458cb437d4aa06d9193f5576c027448 (patch) | |
| tree | acafeca39279554d7be71af4de35cb43c8fc80e7 /mysql-test/t/parser.test | |
| parent | a999acf26ecbe815f9b10780153384bea7840a03 (diff) | |
| download | mariadb-git-4c0e2960d458cb437d4aa06d9193f5576c027448.tar.gz | |
MDEV-10051 Fix subselect to return a syntax error instead of "Incorrect 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 7d1582c397c..0065c5d0b5c 100644 --- a/mysql-test/t/parser.test +++ b/mysql-test/t/parser.test @@ -949,7 +949,7 @@ eval SELECT 1 FROM ($q) a; let $q=SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1; --error ER_PARSE_ERROR eval $q; ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR eval SELECT ($q); --error ER_PARSE_ERROR eval SELECT 1 FROM ($q) a; @@ -957,7 +957,7 @@ eval SELECT 1 FROM ($q) a; let $q=SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1; --error ER_PARSE_ERROR eval $q; ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR eval SELECT ($q); --error ER_PARSE_ERROR eval SELECT 1 FROM ($q) a; @@ -965,7 +965,7 @@ eval SELECT 1 FROM ($q) a; let $q=SELECT 1 FROM t1 ORDER BY 1 LIMIT 1 UNION SELECT 1 FROM t1; --error ER_PARSE_ERROR eval $q; ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR eval SELECT ($q); --error ER_PARSE_ERROR eval SELECT 1 FROM ($q) a; @@ -981,7 +981,7 @@ eval SELECT 1 FROM ($q) a; let $q=SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 ORDER BY 1; --error ER_PARSE_ERROR eval $q; ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR eval SELECT ($q); --error ER_PARSE_ERROR eval SELECT 1 FROM ($q) a; @@ -989,7 +989,7 @@ eval SELECT 1 FROM ($q) a; let $q=SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 LIMIT 1; --error ER_PARSE_ERROR eval $q; ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR eval SELECT ($q); --error ER_PARSE_ERROR eval SELECT 1 FROM ($q) a; @@ -997,7 +997,7 @@ eval SELECT 1 FROM ($q) a; let $q=SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 ORDER BY 1; --error ER_PARSE_ERROR eval $q; ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR eval SELECT ($q); --error ER_PARSE_ERROR eval SELECT 1 FROM ($q) a; @@ -1005,7 +1005,7 @@ eval SELECT 1 FROM ($q) a; let $q=SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 LIMIT 1; --error ER_PARSE_ERROR eval $q; ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR eval SELECT ($q); --error ER_PARSE_ERROR eval SELECT 1 FROM ($q) a; |