diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-05-06 11:42:48 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-05-06 11:42:48 +0400 |
| commit | c0a59b46be5be341bd6ffc9fe188a236ced46522 (patch) | |
| tree | 2201d085452451997fd43d209a583b2ed501a3d2 /mysql-test/r/parser.result | |
| parent | 7905ea89048e5e221870c355e87bb6fbe0a28387 (diff) | |
| download | mariadb-git-c0a59b46be5be341bd6ffc9fe188a236ced46522.tar.gz | |
MDEV-10030 sql_yacc.yy: Split table_expression and remove PROCEDURE from create_select, select_paren_derived, select_derived2, query_specification
This change refactors the "table_expression" rule in sql_yacc.yy.
Queries with subselects and derived tables, as well as "CREATE TABLE ... SELECT"
now return syntax error instead of "Incorrect usage of PROCEDURE and ...".
Diffstat (limited to 'mysql-test/r/parser.result')
| -rw-r--r-- | mysql-test/r/parser.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/parser.result b/mysql-test/r/parser.result index 01cc9d79aaf..18a8e13815c 100644 --- a/mysql-test/r/parser.result +++ b/mysql-test/r/parser.result @@ -686,7 +686,7 @@ FOR UPDATE) a; SELECT 1 FROM (SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 PROCEDURE ANALYSE() FOR UPDATE) a; -ERROR HY000: Incorrect usage of PROCEDURE and subquery +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 'PROCEDURE ANALYSE() FOR UPDATE) a' at line 3 SELECT 1 FROM t1 WHERE EXISTS(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 FOR UPDATE); @@ -694,7 +694,7 @@ FOR UPDATE); SELECT 1 FROM t1 WHERE EXISTS(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 PROCEDURE ANALYSE() FOR UPDATE); -ERROR HY000: Incorrect usage of PROCEDURE and subquery +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 'PROCEDURE ANALYSE() FOR UPDATE)' at line 3 SELECT 1 FROM t1 UNION SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 |