summaryrefslogtreecommitdiff
path: root/mysql-test/t/subselect.test
diff options
context:
space:
mode:
authorMithun C Y <mithun.c.y@oracle.com>2015-08-17 15:26:01 +0530
committerMithun C Y <mithun.c.y@oracle.com>2015-08-17 15:26:01 +0530
commit8fe0708808ddba0d85798d0cd9100b3173064081 (patch)
treecb8e3e07e4c6fd7254b41c2329bc6ec017811cdd /mysql-test/t/subselect.test
parent608efca4c4e4afa1ffea251abda675fcc06efc69 (diff)
parent557a57f3a23c486fbe12b66306ab7adffd609677 (diff)
downloadmariadb-git-8fe0708808ddba0d85798d0cd9100b3173064081.tar.gz
Merge branch 'mysql-5.1' into mysql-5.5
Diffstat (limited to 'mysql-test/t/subselect.test')
-rw-r--r--mysql-test/t/subselect.test2
1 files changed, 1 insertions, 1 deletions
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;