From: Ole John Aske
Date: November 13 2012 3:07pm
Subject: bzr push into mysql-5.5-cluster-7.2 branch (ole.john.aske:4090 to 4091)
 Bug#14709490
List-Archive: http://lists.mysql.com/commits/145250
X-Bug: 14709490
Message-Id: <20121113150733.21721.85367.4091@khepri40.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4091 Ole John Aske	2012-11-13
      Addendum to fix for bug#14709490 testcase: Mask 'rows' from explain result as it is platform dependent.

    modified:
      mysql-test/suite/ndb/r/ndb_bushy_joins.result
      mysql-test/suite/ndb/t/ndb_bushy_joins.test
 4090 magnus.blaudd@stripped	2012-11-13 [merge]
      Merge

    modified:
      storage/ndb/compile-cluster
=== modified file 'mysql-test/suite/ndb/r/ndb_bushy_joins.result'

=== modified file 'mysql-test/suite/ndb/r/ndb_bushy_joins.result'
--- a/mysql-test/suite/ndb/r/ndb_bushy_joins.result	2012-11-13 10:27:06 +0000
+++ b/mysql-test/suite/ndb/r/ndb_bushy_joins.result	2012-11-13 15:07:11 +0000
@@ -184,23 +184,23 @@
 where parent.a < 1000
 ;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	parent	range	PRIMARY	PRIMARY	4	NULL	1104	Parent of 17 pushed join@1; Using where with pushed condition
-1	SIMPLE	c1	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c2	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c3	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c4	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c5	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c6	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c7	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c8	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c9	ref	PRIMARY	PRIMARY	4	test.c1.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c10	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c11	ref	PRIMARY	PRIMARY	4	test.c10.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c12	ref	PRIMARY	PRIMARY	4	test.c10.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c13	ref	PRIMARY	PRIMARY	4	test.c10.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c14	ref	PRIMARY	PRIMARY	4	test.c10.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c15	ref	PRIMARY	PRIMARY	4	test.c10.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c16	ref	PRIMARY	PRIMARY	4	test.c10.a	54	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	parent	range	PRIMARY	PRIMARY	4	NULL	###	Parent of 17 pushed join@1; Using where with pushed condition
+1	SIMPLE	c1	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c2	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c3	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c4	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c5	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c6	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c7	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c8	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c9	ref	PRIMARY	PRIMARY	4	test.c1.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c10	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c11	ref	PRIMARY	PRIMARY	4	test.c10.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c12	ref	PRIMARY	PRIMARY	4	test.c10.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c13	ref	PRIMARY	PRIMARY	4	test.c10.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c14	ref	PRIMARY	PRIMARY	4	test.c10.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c15	ref	PRIMARY	PRIMARY	4	test.c10.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c16	ref	PRIMARY	PRIMARY	4	test.c10.a	###	Child of 'parent' in pushed join@1; Using where
 select straight_join count(*) from parent
 join ref_child as c1 on c1.a = parent.b
 join ref_child as c2 on c2.a = parent.b
@@ -261,39 +261,39 @@
 where parent.a < 1000
 ;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	parent	range	PRIMARY	PRIMARY	4	NULL	1104	Parent of 32 pushed join@1; Using where with pushed condition
-1	SIMPLE	c1	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c1eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c1.b	1	Child of 'c1' in pushed join@1
-1	SIMPLE	c2	ref	PRIMARY	PRIMARY	4	test.c1.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c2eq	eq_ref	PRIMARY	PRIMARY	8	test.c2.a,test.c2.b	1	Child of 'c2' in pushed join@1; Using where
-1	SIMPLE	c3	ref	PRIMARY	PRIMARY	4	test.c2.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c3eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c3.b	1	Child of 'c3' in pushed join@1
-1	SIMPLE	c4	ref	PRIMARY	PRIMARY	4	test.c3.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c4eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c4.b	1	Child of 'c4' in pushed join@1
-1	SIMPLE	c5	ref	PRIMARY	PRIMARY	4	test.c4.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c5eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c5.b	1	Child of 'c5' in pushed join@1
-1	SIMPLE	c6	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c6eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c6.b	1	Child of 'c6' in pushed join@1
-1	SIMPLE	c7	ref	PRIMARY	PRIMARY	4	test.c5eq.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c7eq	eq_ref	PRIMARY	PRIMARY	8	test.c6.a,test.c7.b	1	Child of 'c7' in pushed join@1; Using where
-1	SIMPLE	c8	ref	PRIMARY	PRIMARY	4	test.c6eq.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c8eq	eq_ref	PRIMARY	PRIMARY	8	test.c7.a,test.c8.b	1	Child of 'c8' in pushed join@1; Using where
-1	SIMPLE	c9	ref	PRIMARY	PRIMARY	4	test.c6eq.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c9eq	eq_ref	PRIMARY	PRIMARY	8	test.c2eq.a,test.c9.b	1	Child of 'c9' in pushed join@1; Using where
-1	SIMPLE	c10	ref	PRIMARY	PRIMARY	4	test.c7.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c10eq	eq_ref	PRIMARY	PRIMARY	8	test.c7eq.a,test.c10.b	1	Child of 'c10' in pushed join@1; Using where
-1	SIMPLE	c11	ref	PRIMARY	PRIMARY	4	test.c7.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c11eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c11.b	1	Child of 'c11' in pushed join@1
-1	SIMPLE	c12	ref	PRIMARY	PRIMARY	4	test.c8eq.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c12eq	eq_ref	PRIMARY	PRIMARY	8	test.c7.a,test.c12.b	1	Child of 'c12' in pushed join@1; Using where
-1	SIMPLE	c13	ref	PRIMARY	PRIMARY	4	test.c6eq.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c13eq	eq_ref	PRIMARY	PRIMARY	8	test.c6.a,test.c13.b	1	Child of 'c13' in pushed join@1; Using where
-1	SIMPLE	c14	ref	PRIMARY	PRIMARY	4	test.c5.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c14eq	eq_ref	PRIMARY	PRIMARY	8	test.c5eq.a,test.c14.b	1	Child of 'c14' in pushed join@1; Using where
-1	SIMPLE	c15	ref	PRIMARY	PRIMARY	4	test.c1eq.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c15eq	eq_ref	PRIMARY	PRIMARY	8	test.c15.a,test.c15.b	1	Child of 'c15' in pushed join@1; Using where
-1	SIMPLE	c16	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c16eq	eq_ref	PRIMARY	PRIMARY	8	test.c5.a,test.c16.b	1	Using where
+1	SIMPLE	parent	range	PRIMARY	PRIMARY	4	NULL	###	Parent of 32 pushed join@1; Using where with pushed condition
+1	SIMPLE	c1	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c1eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c1.b	###	Child of 'c1' in pushed join@1
+1	SIMPLE	c2	ref	PRIMARY	PRIMARY	4	test.c1.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c2eq	eq_ref	PRIMARY	PRIMARY	8	test.c2.a,test.c2.b	###	Child of 'c2' in pushed join@1; Using where
+1	SIMPLE	c3	ref	PRIMARY	PRIMARY	4	test.c2.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c3eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c3.b	###	Child of 'c3' in pushed join@1
+1	SIMPLE	c4	ref	PRIMARY	PRIMARY	4	test.c3.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c4eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c4.b	###	Child of 'c4' in pushed join@1
+1	SIMPLE	c5	ref	PRIMARY	PRIMARY	4	test.c4.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c5eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c5.b	###	Child of 'c5' in pushed join@1
+1	SIMPLE	c6	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c6eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c6.b	###	Child of 'c6' in pushed join@1
+1	SIMPLE	c7	ref	PRIMARY	PRIMARY	4	test.c5eq.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c7eq	eq_ref	PRIMARY	PRIMARY	8	test.c6.a,test.c7.b	###	Child of 'c7' in pushed join@1; Using where
+1	SIMPLE	c8	ref	PRIMARY	PRIMARY	4	test.c6eq.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c8eq	eq_ref	PRIMARY	PRIMARY	8	test.c7.a,test.c8.b	###	Child of 'c8' in pushed join@1; Using where
+1	SIMPLE	c9	ref	PRIMARY	PRIMARY	4	test.c6eq.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c9eq	eq_ref	PRIMARY	PRIMARY	8	test.c2eq.a,test.c9.b	###	Child of 'c9' in pushed join@1; Using where
+1	SIMPLE	c10	ref	PRIMARY	PRIMARY	4	test.c7.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c10eq	eq_ref	PRIMARY	PRIMARY	8	test.c7eq.a,test.c10.b	###	Child of 'c10' in pushed join@1; Using where
+1	SIMPLE	c11	ref	PRIMARY	PRIMARY	4	test.c7.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c11eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c11.b	###	Child of 'c11' in pushed join@1
+1	SIMPLE	c12	ref	PRIMARY	PRIMARY	4	test.c8eq.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c12eq	eq_ref	PRIMARY	PRIMARY	8	test.c7.a,test.c12.b	###	Child of 'c12' in pushed join@1; Using where
+1	SIMPLE	c13	ref	PRIMARY	PRIMARY	4	test.c6eq.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c13eq	eq_ref	PRIMARY	PRIMARY	8	test.c6.a,test.c13.b	###	Child of 'c13' in pushed join@1; Using where
+1	SIMPLE	c14	ref	PRIMARY	PRIMARY	4	test.c5.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c14eq	eq_ref	PRIMARY	PRIMARY	8	test.c5eq.a,test.c14.b	###	Child of 'c14' in pushed join@1; Using where
+1	SIMPLE	c15	ref	PRIMARY	PRIMARY	4	test.c1eq.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c15eq	eq_ref	PRIMARY	PRIMARY	8	test.c15.a,test.c15.b	###	Child of 'c15' in pushed join@1; Using where
+1	SIMPLE	c16	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c16eq	eq_ref	PRIMARY	PRIMARY	8	test.c5.a,test.c16.b	###	Using where
 select straight_join count(*) from parent
 join ref_child as c1 on c1.a = parent.b
 join eq_child as c1eq on c1eq.a = c1.a and c1eq.b = c1.b
@@ -574,23 +574,23 @@
 where parent.a < 1000
 ;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	parent	range	PRIMARY	PRIMARY	4	NULL	1104	Parent of 17 pushed join@1; Using where with pushed condition
-1	SIMPLE	c1	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c2	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c3	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c4	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c5	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c6	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c7	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c8	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c9	ref	PRIMARY	PRIMARY	4	test.c1.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c10	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c11	ref	PRIMARY	PRIMARY	4	test.c10.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c12	ref	PRIMARY	PRIMARY	4	test.c10.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c13	ref	PRIMARY	PRIMARY	4	test.c10.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c14	ref	PRIMARY	PRIMARY	4	test.c10.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c15	ref	PRIMARY	PRIMARY	4	test.c10.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c16	ref	PRIMARY	PRIMARY	4	test.c10.a	54	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	parent	range	PRIMARY	PRIMARY	4	NULL	###	Parent of 17 pushed join@1; Using where with pushed condition
+1	SIMPLE	c1	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c2	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c3	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c4	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c5	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c6	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c7	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c8	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c9	ref	PRIMARY	PRIMARY	4	test.c1.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c10	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c11	ref	PRIMARY	PRIMARY	4	test.c10.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c12	ref	PRIMARY	PRIMARY	4	test.c10.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c13	ref	PRIMARY	PRIMARY	4	test.c10.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c14	ref	PRIMARY	PRIMARY	4	test.c10.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c15	ref	PRIMARY	PRIMARY	4	test.c10.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c16	ref	PRIMARY	PRIMARY	4	test.c10.a	###	Child of 'parent' in pushed join@1; Using where
 select straight_join count(*) from parent
 join ref_child as c1 on c1.a = parent.b
 join ref_child as c2 on c2.a = parent.b
@@ -694,39 +694,39 @@
 where parent.a < 1000
 ;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	parent	range	PRIMARY	PRIMARY	4	NULL	1104	Parent of 32 pushed join@1; Using where with pushed condition
-1	SIMPLE	c1	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c1eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c1.b	1	Child of 'c1' in pushed join@1
-1	SIMPLE	c2	ref	PRIMARY	PRIMARY	4	test.c1.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c2eq	eq_ref	PRIMARY	PRIMARY	8	test.c2.a,test.c2.b	1	Child of 'c2' in pushed join@1; Using where
-1	SIMPLE	c3	ref	PRIMARY	PRIMARY	4	test.c2.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c3eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c3.b	1	Child of 'c3' in pushed join@1
-1	SIMPLE	c4	ref	PRIMARY	PRIMARY	4	test.c3.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c4eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c4.b	1	Child of 'c4' in pushed join@1
-1	SIMPLE	c5	ref	PRIMARY	PRIMARY	4	test.c4.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c5eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c5.b	1	Child of 'c5' in pushed join@1
-1	SIMPLE	c6	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c6eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c6.b	1	Child of 'c6' in pushed join@1
-1	SIMPLE	c7	ref	PRIMARY	PRIMARY	4	test.c5eq.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c7eq	eq_ref	PRIMARY	PRIMARY	8	test.c6.a,test.c7.b	1	Child of 'c7' in pushed join@1; Using where
-1	SIMPLE	c8	ref	PRIMARY	PRIMARY	4	test.c6eq.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c8eq	eq_ref	PRIMARY	PRIMARY	8	test.c7.a,test.c8.b	1	Child of 'c8' in pushed join@1; Using where
-1	SIMPLE	c9	ref	PRIMARY	PRIMARY	4	test.c6eq.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c9eq	eq_ref	PRIMARY	PRIMARY	8	test.c2eq.a,test.c9.b	1	Child of 'c9' in pushed join@1; Using where
-1	SIMPLE	c10	ref	PRIMARY	PRIMARY	4	test.c7.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c10eq	eq_ref	PRIMARY	PRIMARY	8	test.c7eq.a,test.c10.b	1	Child of 'c10' in pushed join@1; Using where
-1	SIMPLE	c11	ref	PRIMARY	PRIMARY	4	test.c7.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c11eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c11.b	1	Child of 'c11' in pushed join@1
-1	SIMPLE	c12	ref	PRIMARY	PRIMARY	4	test.c8eq.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c12eq	eq_ref	PRIMARY	PRIMARY	8	test.c7.a,test.c12.b	1	Child of 'c12' in pushed join@1; Using where
-1	SIMPLE	c13	ref	PRIMARY	PRIMARY	4	test.c6eq.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c13eq	eq_ref	PRIMARY	PRIMARY	8	test.c6.a,test.c13.b	1	Child of 'c13' in pushed join@1; Using where
-1	SIMPLE	c14	ref	PRIMARY	PRIMARY	4	test.c5.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c14eq	eq_ref	PRIMARY	PRIMARY	8	test.c5eq.a,test.c14.b	1	Child of 'c14' in pushed join@1; Using where
-1	SIMPLE	c15	ref	PRIMARY	PRIMARY	4	test.c1eq.a	54	Child of 'parent' in pushed join@1; Using where
-1	SIMPLE	c15eq	eq_ref	PRIMARY	PRIMARY	8	test.c15.a,test.c15.b	1	Child of 'c15' in pushed join@1; Using where
-1	SIMPLE	c16	ref	PRIMARY	PRIMARY	4	test.parent.b	54	Child of 'parent' in pushed join@1
-1	SIMPLE	c16eq	eq_ref	PRIMARY	PRIMARY	8	test.c5.a,test.c16.b	1	Using where
+1	SIMPLE	parent	range	PRIMARY	PRIMARY	4	NULL	###	Parent of 32 pushed join@1; Using where with pushed condition
+1	SIMPLE	c1	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c1eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c1.b	###	Child of 'c1' in pushed join@1
+1	SIMPLE	c2	ref	PRIMARY	PRIMARY	4	test.c1.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c2eq	eq_ref	PRIMARY	PRIMARY	8	test.c2.a,test.c2.b	###	Child of 'c2' in pushed join@1; Using where
+1	SIMPLE	c3	ref	PRIMARY	PRIMARY	4	test.c2.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c3eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c3.b	###	Child of 'c3' in pushed join@1
+1	SIMPLE	c4	ref	PRIMARY	PRIMARY	4	test.c3.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c4eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c4.b	###	Child of 'c4' in pushed join@1
+1	SIMPLE	c5	ref	PRIMARY	PRIMARY	4	test.c4.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c5eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c5.b	###	Child of 'c5' in pushed join@1
+1	SIMPLE	c6	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c6eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c6.b	###	Child of 'c6' in pushed join@1
+1	SIMPLE	c7	ref	PRIMARY	PRIMARY	4	test.c5eq.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c7eq	eq_ref	PRIMARY	PRIMARY	8	test.c6.a,test.c7.b	###	Child of 'c7' in pushed join@1; Using where
+1	SIMPLE	c8	ref	PRIMARY	PRIMARY	4	test.c6eq.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c8eq	eq_ref	PRIMARY	PRIMARY	8	test.c7.a,test.c8.b	###	Child of 'c8' in pushed join@1; Using where
+1	SIMPLE	c9	ref	PRIMARY	PRIMARY	4	test.c6eq.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c9eq	eq_ref	PRIMARY	PRIMARY	8	test.c2eq.a,test.c9.b	###	Child of 'c9' in pushed join@1; Using where
+1	SIMPLE	c10	ref	PRIMARY	PRIMARY	4	test.c7.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c10eq	eq_ref	PRIMARY	PRIMARY	8	test.c7eq.a,test.c10.b	###	Child of 'c10' in pushed join@1; Using where
+1	SIMPLE	c11	ref	PRIMARY	PRIMARY	4	test.c7.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c11eq	eq_ref	PRIMARY	PRIMARY	8	test.parent.b,test.c11.b	###	Child of 'c11' in pushed join@1
+1	SIMPLE	c12	ref	PRIMARY	PRIMARY	4	test.c8eq.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c12eq	eq_ref	PRIMARY	PRIMARY	8	test.c7.a,test.c12.b	###	Child of 'c12' in pushed join@1; Using where
+1	SIMPLE	c13	ref	PRIMARY	PRIMARY	4	test.c6eq.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c13eq	eq_ref	PRIMARY	PRIMARY	8	test.c6.a,test.c13.b	###	Child of 'c13' in pushed join@1; Using where
+1	SIMPLE	c14	ref	PRIMARY	PRIMARY	4	test.c5.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c14eq	eq_ref	PRIMARY	PRIMARY	8	test.c5eq.a,test.c14.b	###	Child of 'c14' in pushed join@1; Using where
+1	SIMPLE	c15	ref	PRIMARY	PRIMARY	4	test.c1eq.a	###	Child of 'parent' in pushed join@1; Using where
+1	SIMPLE	c15eq	eq_ref	PRIMARY	PRIMARY	8	test.c15.a,test.c15.b	###	Child of 'c15' in pushed join@1; Using where
+1	SIMPLE	c16	ref	PRIMARY	PRIMARY	4	test.parent.b	###	Child of 'parent' in pushed join@1
+1	SIMPLE	c16eq	eq_ref	PRIMARY	PRIMARY	8	test.c5.a,test.c16.b	###	Using where
 select straight_join count(*) from parent
 join ref_child as c1 on c1.a = parent.b
 join eq_child as c1eq on c1eq.a = c1.a and c1eq.b = c1.b

=== modified file 'mysql-test/suite/ndb/t/ndb_bushy_joins.test'
--- a/mysql-test/suite/ndb/t/ndb_bushy_joins.test	2012-11-13 12:07:51 +0000
+++ b/mysql-test/suite/ndb/t/ndb_bushy_joins.test	2012-11-13 15:07:11 +0000
@@ -9,6 +9,11 @@
 # job buffer overflow as too many requests was
 # sent in parallel from the SPJ block.
 # (bug#14709490)
+#
+# '--replace_column 9 ###' is used for explains throughout
+# the test as experience has shown that 'rows' estimates
+# may vary depending on OS, compiler and .. phase of moon.
+#
 ########################################################
 
 --source include/not_embedded.inc
@@ -175,12 +180,14 @@
 -- echo ===============================
 -- echo Run single instance of 'query3' 
 -- echo ===============================
+--replace_column 9 ###
 eval explain $query3;
 eval $query3;
 
 -- echo ===============================
 -- echo Run single instance of 'query4' 
 -- echo ===============================
+--replace_column 9 ###
 eval explain $query4;
 eval $query4;
 
@@ -229,6 +236,7 @@
 -- echo Run multiple 'query3' in parallel 
 -- echo =================================
 let $query = $query3;
+--replace_column 9 ###
 eval explain $query;
 connection j1;
 send_eval $query;
@@ -249,6 +257,7 @@
 -- echo Run multiple 'query4' in parallel 
 -- echo =================================
 let $query = $query4;
+--replace_column 9 ###
 eval explain $query;
 connection j1;
 send_eval $query;

No bundle (reason: useless for push emails).