summaryrefslogtreecommitdiff
path: root/mysql-test/suite/pbxt/t
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2009-11-06 18:22:32 +0100
committerunknown <knielsen@knielsen-hq.org>2009-11-06 18:22:32 +0100
commitad368a2b54f4177daf5abd17fa7533f1626f6feb (patch)
treec762060dc3c06f7b35460ef22fecc08cf8adee55 /mysql-test/suite/pbxt/t
parent716c09936365c9cfeb2304ca54ffdd95c1031c6e (diff)
parenta6793a48e20c2aebb1391e2f4f916cf147ff1900 (diff)
downloadmariadb-git-ad368a2b54f4177daf5abd17fa7533f1626f6feb.tar.gz
Merge Mysql 5.1.39 merge into MariaDB trunk
Diffstat (limited to 'mysql-test/suite/pbxt/t')
-rw-r--r--mysql-test/suite/pbxt/t/subselect.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/pbxt/t/subselect.test b/mysql-test/suite/pbxt/t/subselect.test
index a623e4027c5..0d7b1252404 100644
--- a/mysql-test/suite/pbxt/t/subselect.test
+++ b/mysql-test/suite/pbxt/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 1221
select (SELECT 1 FROM (SELECT 1) a PROCEDURE ANALYSE(1));
--- error 1108
+-- error ER_WRONG_USAGE
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;