From: Tor Didriksen
Date: September 30 2010 3:08pm
Subject: bzr commit into mysql-next-mr-bugfixing branch (tor.didriksen:3259) Bug#54190
List-Archive: http://lists.mysql.com/commits/119565
X-Bug: 54190
Message-Id: <20100930150827.75444372C@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8784891713415078986=="

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

#At file:///export/home/didrik/repo/next-mr-opt-backporting-merge-from-opt-team/ based on revid:tor.didriksen@stripped

 3259 Tor Didriksen	2010-09-30
      Bug #54190: Comparison to row subquery produces incorrect result

    modified:
      mysql-test/r/subquery_all_jcl6.result
      mysql-test/r/subquery_nomat_nosj.result
      mysql-test/r/subquery_nomat_nosj_jcl6.result
      mysql-test/r/subquery_none_jcl6.result
=== modified file 'mysql-test/r/subquery_all_jcl6.result'
--- a/mysql-test/r/subquery_all_jcl6.result	2010-09-01 13:46:08 +0000
+++ b/mysql-test/r/subquery_all_jcl6.result	2010-09-30 15:08:22 +0000
@@ -927,7 +927,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
@@ -937,7 +937,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');

=== modified file 'mysql-test/r/subquery_nomat_nosj.result'
--- a/mysql-test/r/subquery_nomat_nosj.result	2010-09-01 13:46:08 +0000
+++ b/mysql-test/r/subquery_nomat_nosj.result	2010-09-30 15:08:22 +0000
@@ -923,7 +923,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
@@ -933,7 +933,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');

=== modified file 'mysql-test/r/subquery_nomat_nosj_jcl6.result'
--- a/mysql-test/r/subquery_nomat_nosj_jcl6.result	2010-09-01 13:46:08 +0000
+++ b/mysql-test/r/subquery_nomat_nosj_jcl6.result	2010-09-30 15:08:22 +0000
@@ -927,7 +927,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
@@ -937,7 +937,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');

=== modified file 'mysql-test/r/subquery_none_jcl6.result'
--- a/mysql-test/r/subquery_none_jcl6.result	2010-09-01 13:46:08 +0000
+++ b/mysql-test/r/subquery_none_jcl6.result	2010-09-30 15:08:22 +0000
@@ -926,7 +926,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
@@ -936,7 +936,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');


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   jipdt0g5uh7zhx5k
# target_branch: file:///export/home/didrik/repo/next-mr-opt-\
#   backporting-merge-from-opt-team/
# testament_sha1: 38936c1b080930e34173cf210eccdc8c60fa73c2
# timestamp: 2010-09-30 17:08:27 +0200
# source_branch: file:///export/home/didrik/repo/next-mr-opt-team-\
#   merge-from-bf/
# base_revision_id: tor.didriksen@stripped\
#   6lg655ibaeicahj9
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWf3lwYUAA0PfgAAwWGP/914F
BgC////wUAYe4goBzM6CKgMjhJKU/RE9TynqeamRhJpp4SaAeoAMJSpso002JppAAAAAAAEiSZCT
ap/pAUe1TJiYaIeoPKMExgNAAANAAAAAACpRAhoyJgFMAKj1DwQhp5J4BkdCo/GZ9VOVO6+rm402
8rRski0wssvumLPbtp8ftfpDeG4GDbTS/fBIz/6do+ayCU7M85k5SkoYQ0Q4aLej+8A2+358sQow
srCMvWAObCo2FA0hXANGj9Xd6U2kHUZcvX/8ocS2HI8TI85D0ZTh5rudlz2J6WeR/3Zj3Hlfadm5
TV/JkFwdpL+Z1N2OBaT5O5VKKFVHhVWsia7aEnEsuUWySh8Tss0VbRhkXksMKSTxXaZLZoWqL1q+
7pws4ExPoZZyS9oyuPPTInvilebt8adf81t4sCuFuhpus3bOPtxucV7BYfsamS4UzZMqelZiRove
cqBG1Lr+mONoOoYDyNjKLGZXY3uW1v/TbfuJdXrImeq47Ep2pSWrMnbI7YO5V2poocDW5WyclG25
Y8jaZndgajZQODJeuaV7QpYWGDJg0Yt9WBe6tV1xoY8N+lcV9y5oY6StHHWZNSb6NeN9i7BVsb2x
52LZsN3Z4W76dI4bFTiVpbJMFDwM21xczB99rblNM25Ol02StP6OrFqwbpcHZyfBLGnLXqUrlJuN
9nQbWWM58242Y707jJje1uXfOOpSgwZ623x345lrWvaRYtzTHNxbM+HVzWvgEhO6uFOYiBG2AWUM
Ks0C6t8G0Mto/QEqOBowJxSilZkZGkEGqkBFIiLiAeQyzRrqPJxY4cSmxSDeEo1wDdcWEGjW56oR
mnITo5ouStudwfhGvu1BmCqIbbb3hHZxDdYCL6MbbYPz+MVv7CfoS8fwF/5E6vrNxpNdHepS6sl0
Lkfv7VHFVHXowcnmr4eFHx4Ptf9QwrPFm5Lgu70VQaXxajGQF2IMg8DjYaygzDhcqVsIycsq+a13
tKtj6c5rd65o8Gp2fiJ64PcPEubm5zdWLc2y5sdzNnlS14YfuxrTpJQPqRvv1+6mk4a+HXk9X2Uz
xTQlOLVcuhV0dXNk7rWDuDyj7rDMxQtJycD1elSL82c2vItspLzFuV3cHP4PEtt96FcjnNEmhb/b
DebHq39LHpTodO9p5rFnNCz/iAjDcgJkZphbwtri6bw01QIVHXDEDRovGSe5BKWEVFQ20vJwlINh
nqZsrrS4tRLSj6DIPUMA1wEm9rXUgsFalMBiVaATbkabp3nmTMni9MfnKyue36Q/PkFmisVXwVgn
FOQMyUnN910OeliCel0YVEIV1kC/wlNpxlsscpP8uJOzGkKU1l0lSzTBzYnYxkukyuLSs+GBcFB7
zx40nkmJo1HeeriR5lOaiU+bVHH5ZuW80X0ui/8lDC+6SpUK+ZhaLDCq/m6STQLaJSer0N3f8Nyj
k7SFlMEp+vDVJbOV7N/WIcQpJsmP0WTSlThp57DnyoUSxMyZGG/TwO/TpqXvQxHVziW1+7LqWhjK
SRfc24SKmvX5Vi9oTT4waNU4Y7aRfO5psaFSswlpQGGpovDWkwvFeLCz7hxAzCuSw9JjY2NliLMd
31DHL+RgCpYDFqLhSndhuN1TMUwt6bFND0YWzc3RQr/jZJkaaJw8FsTc+x7RP4yJ8r07jo6MXE2T
Y9i+Tl8y89SdjQovSbw1vUbX4PNqd6/bGoE5BK0P4u5IpwoSH7y4MKA=


--===============8784891713415078986==--