bzr commit into mysql-next-mr-merge branch (bjorn.munch:3208)

[Bjorn Munch]

#At file:///home/bm136801/my/merge-nx/ based on revid:bjorn.munch@stripped

 3208 Bjorn Munch	2010-09-10
      fixed some result files after upmerge of 54190

    modified:
      mysql-test/r/select_none.result
      mysql-test/r/subquery_none.result
=== modified file 'mysql-test/r/select_none.result'
--- a/mysql-test/r/select_none.result	2010-08-27 06:36:54 +0000
+++ b/mysql-test/r/select_none.result	2010-09-10 09:38:40 +0000
@@ -4430,11 +4430,6 @@ SELECT 1 FROM t1 WHERE a <> 1 AND NOT
 ROW(1,a) <=> ROW(1,(SELECT 1 FROM t1))
 INTO @var0;
 ERROR 21000: Subquery returns more than 1 row
-SELECT 1 FROM t1 WHERE a <> 1 AND NOT
-ROW(a,a) <=> ROW((SELECT 1 FROM t1 WHERE 1=2),(SELECT 1 FROM t1));
-1
-1
-1
 DROP TABLE t1;
 #
 # Bug #48458: simple query tries to allocate enormous amount of

=== modified file 'mysql-test/r/subquery_none.result'
--- a/mysql-test/r/subquery_none.result	2010-08-27 06:36:54 +0000
+++ b/mysql-test/r/subquery_none.result	2010-09-10 09:38:40 +0000
@@ -922,7 +922,7 @@ select a, (select a,b,c from t1 where t1
 a	(select a,b,c from t1 where t1.a=t2.a) = ROW(a,2,'a')	(select c from t1 where a=t2.a)
 1	1	a
 2	0	b
-NULL	0	NULL
+NULL	NULL	NULL
 select a, (select a,b,c from t1 where t1.a=t2.a) = ROW(a,3,'b'),(select c from t1 where a=t2.a) from t2;
 a	(select a,b,c from t1 where t1.a=t2.a) = ROW(a,3,'b')	(select c from t1 where a=t2.a)
 1	0	a
@@ -932,7 +932,7 @@ select a, (select a,b,c from t1 where t1
 a	(select a,b,c from t1 where t1.a=t2.a) = ROW(a,4,'c')	(select c from t1 where a=t2.a)
 1	0	a
 2	0	b
-NULL	0	NULL
+NULL	NULL	NULL
 drop table t1,t2;
 create table t1 (a int, b real, c varchar(10));
 insert into t1 values (1, 1, 'a'), (2,2,'b'), (NULL, 2, 'b');


Attachment: [text/bzr-bundle] bzr/[e-mail]