summaryrefslogtreecommitdiff
path: root/mysql-test/r/subselect.result
diff options
context:
space:
mode:
authorSergey Glukhov <Sergey.Glukhov@sun.com>2009-08-27 15:59:25 +0500
committerSergey Glukhov <Sergey.Glukhov@sun.com>2009-08-27 15:59:25 +0500
commit51f4ccfa43b8233227ca0257a293f41b2153e42b (patch)
tree6c51e017537127fec10e4295a85aed40e987d52d /mysql-test/r/subselect.result
parent1759f9ecb4a8ba67804410a8902c00ebbe12545a (diff)
parent367c14b854f4afe6cfd41b9f56bf8fbf3c337b65 (diff)
downloadmariadb-git-51f4ccfa43b8233227ca0257a293f41b2153e42b.tar.gz
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'mysql-test/r/subselect.result')
-rw-r--r--mysql-test/r/subselect.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 7fbaad3133a..bb5927122a5 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 HY000: Incorrect usage of PROCEDURE and subquery
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;