From: Ole John Aske
Date: March 24 2011 7:57am
Subject: bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3453)
List-Archive: http://lists.mysql.com/commits/133722
Message-Id: <20110324075723.D5F71218@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4772422848456880402=="

--===============4772422848456880402==
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

 3453 Ole John Aske	2011-03-24
      SPJ: Updated resultfile after format of EXPLAIN for pushed joins has changed.

    modified:
      mysql-test/suite/ndb/r/ndb_dbug_tc_select.result
=== modified file 'mysql-test/suite/ndb/r/ndb_dbug_tc_select.result'
--- a/mysql-test/suite/ndb/r/ndb_dbug_tc_select.result	2010-02-12 08:08:03 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dbug_tc_select.result	2011-03-24 07:57:19 +0000
@@ -10,14 +10,14 @@ create table t2 (a int, b int, c int, d 
 explain select t2.c from t1,t2 where t1.a=50 and t2.a=t1.a and t2.b=t1.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	const	PRIMARY	PRIMARY	4	const	#	Parent of 2 pushed join@1
-1	SIMPLE	t2	eq_ref	PRIMARY	PRIMARY	8	const,test.t1.b	#	Child of pushed join@1
+1	SIMPLE	t2	eq_ref	PRIMARY	PRIMARY	8	const,test.t1.b	#	Child of 't1' in pushed join@1
 #
 # 2-way join tc selection in unique key
 #
 explain select t1.b from t1,t2 where t2.d=50 and t1.a=t2.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	ref	PRIMARY,d	d	5	const	#	Parent of 2 pushed join@1; Using where with pushed condition
-1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.a	#	Child of pushed join@1
+1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.a	#	Child of 't2' in pushed join@1
 drop table t1,t2;
 #
 # Test tc select with 2-way joins with scan followed by unique lookup
@@ -27,7 +27,7 @@ create table t2 (a int, b int, c int, pr
 explain select t2.c from t1,t2 where t1.a=50 and t2.a=t1.a and t2.b=t1.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ref	PRIMARY	PRIMARY	4	const	#	Parent of 2 pushed join@1
-1	SIMPLE	t2	eq_ref	PRIMARY	PRIMARY	8	const,test.t1.b	#	Child of pushed join@1
+1	SIMPLE	t2	eq_ref	PRIMARY	PRIMARY	8	const,test.t1.b	#	Child of 't1' in pushed join@1
 drop table t1,t2;
 create table t1 (a int , b varchar(22), c int, primary key(a), unique(b)) engine ndb;
 # verify tc select on insert using simple int key


--===============4772422848456880402==
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\
#   8ddugnaldflo50sl
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj-scan-scan/
# testament_sha1: 6a23c166f4eb6546d1fa41928b8dd258fdd98cca
# timestamp: 2011-03-24 08:57:23 +0100
# source_branch: bzr+ssh://oaske@stripped/bzrroot/server\
#   /mysql-5.1-telco-7.0/
# base_revision_id: ole.john.aske@stripped\
#   8fr8njy81ok81cn7
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRCkkocAAatfgAAwWOf/93o3
2mC///9wUAPntwm7vb3rMeksEkk001NNDET0KfhU80kMhp6I0009Jp6mjQZRMgYE0TUzakaDQAAA
AAElAJimmjKn4lNo9UNpqaDT1DTIDQAGUgIaNGgAZAyaaAAYmEZASRIQ08pknlNhT1NJ6ntUek0y
AGg0NNDsOz5qZMu5VLYNpMVZrwlTcneJLNILVkpEa32wvhB8XX6FGzuvZmDl+Ec3wY3sDmHMvCGR
3BubcfLn/peXuTBtZVUQinmgEqqPKGWPanZHpWiZuQZajAkfsRTw6g5GVcvjWF/NOfC59kLFtlYS
KwiZBDwb7lOWoGpEEMHOZPhBrh/Boh1uNzkGyS4IK+klOagFitqPdQsJi6lf7ly2IxtanQL2GlvD
WgzLuMEHiMiJCMtWGMibeOWZIsqDlmu0/Vr6Fxhz3CgUKRU3Xw5eSKyPHKjjaO3AmYwaWyqmsFsZ
dAOtzR+Rd0vN61axzbAkVnFI0LICOOAdqxkGlzlwDJ6Y66a4lQKDghpYm2Uc6VBwep8r5VWjYqEd
YLtmhBZEFmiWNF51bSpPzTD37FeHEc25ltOBtNIrguQTa6VjjPIYZ+nInrp0BUXrpW21h9WN9M9W
2wUWV6tgLK6mx5srtoL6bTSeGuOpipXoycyGTTawGScmSZAsCVjOJf04T3N0aYduj1BEQxA1k2EF
A56CsVFZAZTFKogCQEOKz2CwCsDUBSUI0Ti6lRo6HIk9F38etQXovpMRIA71kxibn3/X5CJupG8M
IrAkD2Ik5SI2sITcSNsvRzUBt2/xDhzWALGKXTdZiool12KBIa8l/d119TsI9S7udI5uBrAmTTti
r4Pxa86RSU0GqdAFn6cgbng0hNfdkD20kAwnUhsBv78cJ0ir7GDs0Qkyj8Z9xMrHhNH2GzbHK1XB
NlzRbP5OKLlE8UywT9tjoXXbHg0ROTp1cFdYWl9S6Omgrj438bRYOHnipPmnRPsgLf0NeDatMAkf
xc4L5FSJi76YlXfyTUWnFFgQKwkvQEn8b7JrAwC7qhnw6TtH7EioNyypatUgrgYNTYgwRdEVvF5O
ahE0hpBSjtrmJlatmI9HM3nDy0z1mUXvOxmkdGKMXJEYbSxPQm2Cu0zB3/Uvpn00PHNdc0qDBEGT
K2+u4UKw+2aSvW5Wloz8GpBRDsc1kvv+BHIIBm6w0xwtYxf15CFbN8rAzXMSTd8+J0PTrkwS9b1F
EZ06mk42B573XdkYhWUtdyjNahzG7A3A340SOSKLrb3Hx80ciuphkVBJzKEjPmNG9Ovd+joHHfRR
/iginsl0YWepRnvGO0jdv0mgKQkZZ7d6YUtNLl7W3B98ittBjg5Zl1rteQ4mrVWZP+LuSKcKEgIU
klDg


--===============4772422848456880402==--