summaryrefslogtreecommitdiff
path: root/mysql-test/suite/pbxt/r/subselect.result
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2009-10-16 14:45:42 +0200
committerunknown <knielsen@knielsen-hq.org>2009-10-16 14:45:42 +0200
commit79181a1c6956be5dc6b439a35947f90dc1f75b8d (patch)
treee4a72f949f252c6ab21f1e5babb7db7adcb83177 /mysql-test/suite/pbxt/r/subselect.result
parent95270c9c434cd35a86403dd696f85bac98e7bf26 (diff)
downloadmariadb-git-79181a1c6956be5dc6b439a35947f90dc1f75b8d.tar.gz
After-merge fixes for MySQL 5.1.39 merge.
Some pbxt test suite files needed updating due to similar changes after bugfixes in MySQL 5.1.39.
Diffstat (limited to 'mysql-test/suite/pbxt/r/subselect.result')
-rw-r--r--mysql-test/suite/pbxt/r/subselect.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/pbxt/r/subselect.result b/mysql-test/suite/pbxt/r/subselect.result
index bae93f76b2c..bb2073030e3 100644
--- a/mysql-test/suite/pbxt/r/subselect.result
+++ b/mysql-test/suite/pbxt/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;