From: Bjorn Munch
Date: September 10 2010 9:38am
Subject: bzr commit into mysql-next-mr-merge branch (bjorn.munch:3208)
List-Archive: http://lists.mysql.com/commits/117983
Message-Id: <201009100938.o8A9cmQk028269@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0157291326=="

--===============0157291326==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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');


--===============0157291326==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/merge-nx/
# testament_sha1: a88aeb5f209a817a058a4cb6dad2565d25511f0e
# timestamp: 2010-09-10 11:38:48 +0200
# source_branch: file:///home/bm136801/my/mtr-nx/
# base_revision_id: bjorn.munch@stripped\
#   8kjw74b0p1p4rqya
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTzEP1sAAftfgEAwUGP/91IH
AgC////wUARN47sZHc3WVAMJKESb1JshmKnkyaTamgNA0ZDQSkE1PJqbRhU000APUAaAMQNPVRNp
DIAAAADJkGQDAAAAADQaANANAJJCaBoJPBGmpN6KbIhpPU9TQPTtvCjRanHvzJyUmqRpmcUIixKQ
1znWZZ5suSo3lgMAKeRlRUciMiLBHF1c5+AAliolUc/2a6oKXk8J7A+V/ApMC3QvPQHMI37fEmak
P0hSVQGZlNueBpjlYSKiAk4pBOFaOi8vIAsLAHcnoSYQMiRUFxgOAVJQEU+A4Nnu+P0MvD0LEclI
s2PQCCIS88QiMiXnTjK51R8I5UVRgu47g22GFWXlneZil42k1BFGPDXB48uhSSnI4EyjM9s8taAv
yzcRNVqyzGHlTK8lPoYPRWdNyQ4nKJjnqSKRiCsPCaglGMQOXEZiRViTk7yssAcDOdZMOGY1Vw7B
n30j6AaZRqUCwx5RKDRR4GcBuFsAWutWzaK5UpgQYTXwKOfgRuNwxr0jpOQIZDMxpxkietkcXjmz
iFjnKkmjcnqmheiPgcEk4kYTmqnkFcLA9uw/A5MWTgX2uzf0Y2s413PJAZaRH8zdSpvEnWjA4DLh
iV6mA4vIw0KpoFJg5ymZwSqgRaDqnqLgaLTKdEZ2nJeqzvKjsZPZM2/ub4FySatCCBHnM/2TUprL
l3SpTV4baExIIQpqGhc0OwYVaN5C3rLXl3TyOHqJdWpSqmR6QIOzvSuXicTvsrW4naRIxxGndKYd
asS5MG8uia8DcBaUVGRIjkB2tGr/gDUS50swl7CV3kvgD5AcVGRrrWptM7Y6GZBsIAvSOQhoTUUj
Q1JzD06PUt1KcJWiYvK+B9HkcJmcexudysyy82HWFCKD0esvjQvYaGOvIVmyiplfNpgjxWRMCGWT
ZGJ1bGqF8+QY8E1Db6+vukW6TAwgNJ9ipW8xPJb8S9w7aztA+ANCDDI2AgkthRzPE8ixHMrM5Fr/
lGo6LlMYpONXFGb9jpdqRpRhmcbbTzPXAFQrKxm4ijavQ2nqWnMTIu1HhMVCTA5N5ZeYHgUYlwBs
mnO3IqOM00F9wWRGiLAmVo3iW0sCiiCTTvMxTigwMoaFvcrr3MUL7DaNUiAvOc6n/iTIrX+oWj1h
pI7rqr+TDB7gRU/GppmKjzA3JH1XBbc4GxIemSCMyV3iKzd6nRR0KQC19/qozAwTWTD/f3boWdWV
Z5IYyKy1i6k4mhYFSIWM9J8DH6pb7j3HRYnUGbpdQXA1Gm1gUorX4GgwZwWPsd1bBL56gti+Fx1I
GKX8gNaszih4H0O60HGE9ZOiyYCkolAJjnpmA/yLz/F3JFOFCQPMQ/Ww


--===============0157291326==--