From: Ole John Aske
Date: March 24 2011 7:57am
Subject: bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3452 to 3453)
List-Archive: http://lists.mysql.com/commits/133723
Message-Id: <20110324075742.17E6A218@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 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
 3452 Ole John Aske	2011-03-23 [merge]
      Merge from mainline telco -> SPJ 
      
      (Mainly of the MCP_BUG-stuff as the 'overly eager sort' fix itself 
       already was present in the SPJ branch )

    modified:
      sql/ha_ndbcluster.cc
      sql/opt_range.cc
      sql/opt_range.h
      sql/sql_select.cc
=== 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

No bundle (reason: useless for push emails).