diff options
| author | Mithun C Y <mithun.c.y@oracle.com> | 2015-08-17 15:26:01 +0530 |
|---|---|---|
| committer | Mithun C Y <mithun.c.y@oracle.com> | 2015-08-17 15:26:01 +0530 |
| commit | 8fe0708808ddba0d85798d0cd9100b3173064081 (patch) | |
| tree | cb8e3e07e4c6fd7254b41c2329bc6ec017811cdd | |
| parent | 608efca4c4e4afa1ffea251abda675fcc06efc69 (diff) | |
| parent | 557a57f3a23c486fbe12b66306ab7adffd609677 (diff) | |
| download | mariadb-git-8fe0708808ddba0d85798d0cd9100b3173064081.tar.gz | |
Merge branch 'mysql-5.1' into mysql-5.5
| -rw-r--r-- | mysql-test/r/subselect.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/subselect.test | 2 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 12 |
3 files changed, 14 insertions, 2 deletions
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result index 45c3283a142..e86111c3177 100644 --- a/mysql-test/r/subselect.result +++ b/mysql-test/r/subselect.result @@ -75,7 +75,7 @@ SELECT 1 FROM (SELECT 1 as a) b WHERE 1 IN (SELECT (SELECT a)); select (SELECT 1 FROM (SELECT 1) a PROCEDURE ANALYSE(1)); ERROR HY000: Incorrect usage of PROCEDURE and subquery SELECT 1 FROM (SELECT 1) a PROCEDURE ANALYSE((SELECT 1)); -ERROR HY000: Incorrect parameters to procedure 'ANALYSE' +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1))' at line 1 SELECT (SELECT 1) as a FROM (SELECT 1) b WHERE (SELECT a) IS NULL; ERROR 42S22: Unknown column 'a' in 'field list' SELECT (SELECT 1) as a FROM (SELECT 1) b WHERE (SELECT a) IS NOT NULL; diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test index fa63340a718..2168d480fd5 100644 --- a/mysql-test/t/subselect.test +++ b/mysql-test/t/subselect.test @@ -30,7 +30,7 @@ SELECT 1 IN (SELECT 1); SELECT 1 FROM (SELECT 1 as a) b WHERE 1 IN (SELECT (SELECT a)); -- error ER_WRONG_USAGE select (SELECT 1 FROM (SELECT 1) a PROCEDURE ANALYSE(1)); --- error ER_WRONG_PARAMETERS_TO_PROCEDURE +-- error ER_PARSE_ERROR SELECT 1 FROM (SELECT 1) a PROCEDURE ANALYSE((SELECT 1)); -- error ER_BAD_FIELD_ERROR SELECT (SELECT 1) as a FROM (SELECT 1) b WHERE (SELECT a) IS NULL; diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index cd86f96900e..16ed61334c6 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -10174,8 +10174,20 @@ procedure_clause: if (add_proc_to_list(lex->thd, item)) MYSQL_YYABORT; Lex->uncacheable(UNCACHEABLE_SIDEEFFECT); + + /* + PROCEDURE CLAUSE cannot handle subquery as one of its parameter, + so set expr_allows_subselect as false to disallow any subqueries + further. Reset expr_allows_subselect back to true once the + parameters are reduced. + */ + Lex->expr_allows_subselect= false; } '(' procedure_list ')' + { + /* Subqueries are allowed from now.*/ + Lex->expr_allows_subselect= true; + } ; procedure_list: |