summaryrefslogtreecommitdiff
path: root/mysql-test/t/subselect.test
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-11-05 12:23:55 +0300
committerAlexander Nozdrin <alik@sun.com>2009-11-05 12:23:55 +0300
commite6fffedb27a922b2ad088fe7ee17f01bd14126fe (patch)
tree1d2987906145df9eb29a94936373c242648e7eeb /mysql-test/t/subselect.test
parent5ae8ae3a8ea0caf4c97c52574b54a2e3a1299cdc (diff)
parenta765de73fe0cd0b0646d6043b6f2833d1572c8ad (diff)
downloadmariadb-git-e6fffedb27a922b2ad088fe7ee17f01bd14126fe.tar.gz
Manual merge from mysql-5.1.
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 17b15bc5a94..7f2dba00ba8 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_USAGE
+-- error ER_WRONG_PARAMETERS_TO_PROCEDURE
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;