From: Ole John Aske
Date: January 14 2011 2:09pm
Subject: bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3406)
List-Archive: http://lists.mysql.com/commits/128773
Message-Id: <20110114140930.ED47F223@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5400321860301671926=="

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

#At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0-spj-scan-scan/ based on revid:ole.john.aske@stripped

 3406 Ole John Aske	2011-01-14
      Updated resultfile after changes caused by update of fix for #58818

    modified:
      mysql-test/r/subselect3.result
=== modified file 'mysql-test/r/subselect3.result'
--- a/mysql-test/r/subselect3.result	2010-12-09 08:04:55 +0000
+++ b/mysql-test/r/subselect3.result	2011-01-14 14:09:24 +0000
@@ -209,7 +209,7 @@ id	select_type	table	type	possible_keys	
 2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 Warnings:
 Note	1276	Field or reference 't2.oref' of SELECT #2 was resolved in SELECT #1
-Note	1003	select `test`.`t2`.`a` AS `a`,`test`.`t2`.`oref` AS `oref`,<in_optimizer>(`test`.`t2`.`a`,<exists>(select count(0) from `test`.`t1` group by `test`.`t1`.`grp` having (((`test`.`t1`.`grp` = `test`.`t2`.`oref`) is true) and trigcond((<cache>(`test`.`t2`.`a`) = <ref_null_helper>(count(0))))))) AS `Z` from `test`.`t2`
+Note	1003	select `test`.`t2`.`a` AS `a`,`test`.`t2`.`oref` AS `oref`,<in_optimizer>(`test`.`t2`.`a`,<exists>(select count(0) from `test`.`t1` group by `test`.`t1`.`grp` having ((`test`.`t1`.`grp` = `test`.`t2`.`oref`) and trigcond((<cache>(`test`.`t2`.`a`) = <ref_null_helper>(count(0))))))) AS `Z` from `test`.`t2`
 drop table t1, t2;
 create table t1 (a int, b int, primary key (a));
 insert into t1 values (1,1), (3,1),(100,1);


--===============5400321860301671926==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/ole.john.aske@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@stripped\
#   zwh29dnrz7v02lxs
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj-scan-scan/
# testament_sha1: b307a0aae790fe86d42701401f426554c4153719
# timestamp: 2011-01-14 15:09:30 +0100
# base_revision_id: ole.john.aske@stripped\
#   s17rwus4lx4vcxqm
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZw2/bQAAalfgAgwWGf/93IR
ihD////wUAQD3OE9d55aua92vCUQmTRNJ6FP9T0mppqeGp6SZAHqM9SaekElTKntU9po0jBNDSaH
pAAAAAJIgQKn4mKeiR4k9I0DI9Q0NBkBkqemjU2oPUDQANGjQaDQAAJJCSPCQ08mT0gnonoIMgAA
IeNuu8x6ZZD5JOq5ucB2xjWNbfl93/D67VFXz/SWueLvU3jJ8tOvYpXR5J59VsjRHLp2yg/99cs1
XYlU6amNUFfprJyz/zQjFQwisDE5I1ba7StorEgSEPXjhfRZlinrRLN2l05HWK9+B+IAlSMwkbVY
+iFsBURO171ebmEOkX3mBHyFCRvc2msJ5iJqyFIStTsruVD4SQU5xOB5vfdNB6mQbiU5EYqp516s
pYiioCln3nutuyT5jBXW43ykeFUWzsJTuBfzLIrnarSoTy6nRgTMTp807zIVbQrFcPIZVCOByYb6
bq2N6MY6bI/dhcW55SmM5WKWKVkghwa2EpVW9MpoTjQQcybFfh1ql1Rs1shLInthtCyPhRdojQV5
DqKN6mguDAzT7199bVFFhstHjpSDyHlSwoVdTk2wm639ehWuBqchakTo1h06xyWzJ8K8WssCqbCY
LNZFCqSVKFtecDO1pzcsYhaikCLDAIGJnnnRHAR3myuKrvKhmEcyiRCAjUKHg8IcfBN8fPfjUj5Q
hd2ube7108dYxizNJRGJoMe1MwMyBosmIuuzthBrlRuKgv14syRXvw1wCBvyVS0QZbOtCSIbjgLz
hDnOUtZAvN3VLTgE304xkejynSVTudMYqIcZohb6P4bUKz5oxKzlM12+NyTNMR0UZcYmedS5TLaM
LC9pTrE7y19mpMkSRxbXMgQ3N43pFuBBkHg6oajC7fzj9PXpjJfuDLsG0Z8ZJ/RhGVFc5tSo7fNi
ywpZO/VAQWIe4oYuR27QWocVNhsrKY8e9w2mLlMxpc+S05pEQwdRdSJqwaDTf1QLLoOfEmMfKZ/x
FF2v7iohcDk7J4BZDwdodqCI8Pz3Zx1GLt/Tn5Ii0znGCsDRxWhAJ8jwc37cTJGhIcQRPVrHsra3
61nsE5YhcFQsbdcdDTlFcY+yUnSHUOMSEAd3HlmK8xRJlq647NMbvLmkYh9j7jPyoVArQb4tLM3+
RDAPBGpxanW6ojK/gjSWhVSj3ed5wqjZClXajjMqXOW/q1dEEl39LqSPasr+xyor21JtxDLmpz7k
x2g1g8hkMRaLMLwfW/5mtGuYKtwBO8RIqGWSRGeg4CnCeSQgEMc2od0VjDXoIKR9mMYR3EZINRlp
nnQbxz50r7MTheGCrZ5OtILb+I4RCxVPbcm0Ac2HBSrrsOJg2GzUSCjSqVWFEtqHicrsDMbTg4XI
9RmJqoC/xdyRThQkJw2/bQA=


--===============5400321860301671926==--