From: Ole John Aske
Date: March 12 2012 2:08pm
Subject: bzr push into mysql-trunk-cluster branch (ole.john.aske:3442 to 3443)
List-Archive: http://lists.mysql.com/commits/143165
Message-Id: <20120312140813.2DE91242@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3443 Ole John Aske	2012-03-12
      Accept new MTR result for test results changed due to WL5855
            
      As part of WL5855: 'Print EXPLAIN in JSON format', there has been minor changes
      in the explain output format - Has to accept these changes in our result file.

    modified:
      mysql-test/suite/ndb/r/ndb_row_count.result
      mysql-test/suite/ndb/r/ndb_statistics0.result
      mysql-test/suite/ndb/r/ndb_statistics1.result
      mysql-test/suite/ndb/r/ndb_subquery.result
 3442 Ole John Aske	2012-03-12
      Accept new MTR result for join pushdown test:
      
      As part of WL5855: 'Print EXPLAIN in JSON format', there has been minor changes
      in the explain output format - Has to accept these changes in our result file.

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      mysql-test/suite/ndb/r/ndb_join_pushdown_nobnl.result
      mysql-test/suite/ndb/r/ndb_join_pushdown_none.result
=== modified file 'mysql-test/suite/ndb/r/ndb_row_count.result'
--- a/mysql-test/suite/ndb/r/ndb_row_count.result	2011-11-10 13:08:24 +0000
+++ b/mysql-test/suite/ndb/r/ndb_row_count.result	2012-03-12 14:07:42 +0000
@@ -16,7 +16,7 @@ insert into t1 values
 # expected result 0 roundtrips - read stats from share
 explain extended select * from t1 where a < 100;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	10	100.00	Using where with pushed condition: (`test`.`t1`.`a` < 100); Using MRR
+1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	10	100.00	Using where with pushed condition (`test`.`t1`.`a` < 100); Using MRR
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` < 100)
 @ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
@@ -26,7 +26,7 @@ insert into t1 select a+100 from t1;
 # expected result 0 roundtrips - read stats from share
 explain extended select * from t1 where a < 100;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	20	100.00	Using where with pushed condition: (`test`.`t1`.`a` < 100); Using MRR
+1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	20	100.00	Using where with pushed condition (`test`.`t1`.`a` < 100); Using MRR
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` < 100)
 @ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
@@ -36,7 +36,7 @@ delete from t1 where a >= 100;
 # expected result 0 roundtrips - read stats from share
 explain extended select * from t1 where a < 100;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	10	100.00	Using where with pushed condition: (`test`.`t1`.`a` < 100); Using MRR
+1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	10	100.00	Using where with pushed condition (`test`.`t1`.`a` < 100); Using MRR
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` < 100)
 @ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
@@ -48,7 +48,7 @@ commit;
 # expected result 0 roundtrips - read stats from share
 explain extended select * from t1 where a < 100;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	20	100.00	Using where with pushed condition: (`test`.`t1`.`a` < 100); Using MRR
+1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	20	100.00	Using where with pushed condition (`test`.`t1`.`a` < 100); Using MRR
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` < 100)
 @ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
@@ -60,7 +60,7 @@ commit;
 # expected result 0 roundtrips - read stats from share
 explain extended select * from t1 where a < 100;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	10	100.00	Using where with pushed condition: (`test`.`t1`.`a` < 100); Using MRR
+1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	10	100.00	Using where with pushed condition (`test`.`t1`.`a` < 100); Using MRR
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` < 100)
 @ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
@@ -72,7 +72,7 @@ rollback;
 # expected result 0 roundtrips - read stats from share
 explain extended select * from t1 where a < 100;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	10	100.00	Using where with pushed condition: (`test`.`t1`.`a` < 100); Using MRR
+1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	10	100.00	Using where with pushed condition (`test`.`t1`.`a` < 100); Using MRR
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` < 100)
 @ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
@@ -84,7 +84,7 @@ rollback;
 # expected result 0 roundtrips - read stats from share
 explain extended select * from t1 where a < 100;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	10	100.00	Using where with pushed condition: (`test`.`t1`.`a` < 100); Using MRR
+1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	10	100.00	Using where with pushed condition (`test`.`t1`.`a` < 100); Using MRR
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` < 100)
 @ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
@@ -95,7 +95,7 @@ ERROR 23000: Can't write; duplicate key 
 # expected result 0 roundtrips - read stats from share
 explain extended select * from t1 where a < 100;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	10	100.00	Using where with pushed condition: (`test`.`t1`.`a` < 100); Using MRR
+1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	10	100.00	Using where with pushed condition (`test`.`t1`.`a` < 100); Using MRR
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` < 100)
 @ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
@@ -107,7 +107,7 @@ ERROR 23000: Can't write; duplicate key 
 # expected result 0 roundtrips - read stats from share
 explain extended select * from t1 where a < 100;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	10	100.00	Using where with pushed condition: (`test`.`t1`.`a` < 100); Using MRR
+1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	10	100.00	Using where with pushed condition (`test`.`t1`.`a` < 100); Using MRR
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` < 100)
 @ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count

=== modified file 'mysql-test/suite/ndb/r/ndb_statistics0.result'
--- a/mysql-test/suite/ndb/r/ndb_statistics0.result	2012-03-05 14:02:05 +0000
+++ b/mysql-test/suite/ndb/r/ndb_statistics0.result	2012-03-12 14:07:42 +0000
@@ -55,7 +55,7 @@ COUNT(*)
 EXPLAIN
 SELECT * FROM t10000 WHERE k = 42;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t10000	const	PRIMARY	PRIMARY	4	const	1	
+1	SIMPLE	t10000	const	PRIMARY	PRIMARY	4	const	1	NULL
 EXPLAIN
 SELECT * FROM t10000 WHERE k >= 42 and k < 10000;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -105,19 +105,19 @@ id	select_type	table	type	possible_keys	
 EXPLAIN
 SELECT * FROM t10000 WHERE I = 0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t10000	ref	I	I	5	const	200	
+1	SIMPLE	t10000	ref	I	I	5	const	200	NULL
 EXPLAIN
 SELECT * FROM t10000 WHERE J = 0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t10000	ref	J	J	5	const	166	
+1	SIMPLE	t10000	ref	J	J	5	const	166	NULL
 EXPLAIN
 SELECT * FROM t10000 WHERE I = 0 AND J = 0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t10000	ref	J,I	I	10	const,const	21	
+1	SIMPLE	t10000	ref	J,I	I	10	const,const	21	NULL
 EXPLAIN
 SELECT * FROM t10000 WHERE I = 0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t10000	ref	I	I	5	const	200	
+1	SIMPLE	t10000	ref	I	I	5	const	200	NULL
 EXPLAIN
 SELECT * FROM t10000 WHERE I = 0 AND J > 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -133,11 +133,11 @@ id	select_type	table	type	possible_keys	
 EXPLAIN
 SELECT * FROM t10000 WHERE I = 0 AND J = 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t10000	ref	J,I	I	10	const,const	21	
+1	SIMPLE	t10000	ref	J,I	I	10	const,const	21	NULL
 EXPLAIN
 SELECT * FROM t10000 WHERE J = 0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t10000	ref	J	J	5	const	166	
+1	SIMPLE	t10000	ref	J	J	5	const	166	NULL
 EXPLAIN
 SELECT * FROM t10000 WHERE J = 0 AND K > 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

=== modified file 'mysql-test/suite/ndb/r/ndb_statistics1.result'
--- a/mysql-test/suite/ndb/r/ndb_statistics1.result	2012-03-05 14:02:05 +0000
+++ b/mysql-test/suite/ndb/r/ndb_statistics1.result	2012-03-12 14:07:42 +0000
@@ -51,7 +51,7 @@ COUNT(*)
 EXPLAIN
 SELECT * FROM t10000 WHERE k = 42;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t10000	const	PRIMARY	PRIMARY	4	const	1	
+1	SIMPLE	t10000	const	PRIMARY	PRIMARY	4	const	1	NULL
 EXPLAIN
 SELECT * FROM t10000 WHERE k >= 42 and k < 10000;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -101,11 +101,11 @@ id	select_type	table	type	possible_keys	
 EXPLAIN
 SELECT * FROM t10000 WHERE I = 0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t10000	ref	I	I	5	const	100	
+1	SIMPLE	t10000	ref	I	I	5	const	100	NULL
 EXPLAIN
 SELECT * FROM t10000 WHERE J = 0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t10000	ref	J	J	5	const	2	
+1	SIMPLE	t10000	ref	J	J	5	const	2	NULL
 EXPLAIN
 SELECT * FROM t10000 WHERE I = 0 AND J = 0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -113,7 +113,7 @@ id	select_type	table	type	possible_keys	
 EXPLAIN
 SELECT * FROM t10000 WHERE I = 0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t10000	ref	I	I	5	const	100	
+1	SIMPLE	t10000	ref	I	I	5	const	100	NULL
 EXPLAIN
 SELECT * FROM t10000 WHERE I = 0 AND J > 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -133,7 +133,7 @@ id	select_type	table	type	possible_keys	
 EXPLAIN
 SELECT * FROM t10000 WHERE J = 0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t10000	ref	J	J	5	const	2	
+1	SIMPLE	t10000	ref	J	J	5	const	2	NULL
 EXPLAIN
 SELECT * FROM t10000 WHERE J = 0 AND K > 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

=== modified file 'mysql-test/suite/ndb/r/ndb_subquery.result'
--- a/mysql-test/suite/ndb/r/ndb_subquery.result	2012-02-29 10:51:31 +0000
+++ b/mysql-test/suite/ndb/r/ndb_subquery.result	2012-03-12 14:07:42 +0000
@@ -12,7 +12,7 @@ insert into t4 values (1,10), (2,10), (3
 explain select * from t2 where p NOT IN (select p from t1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	#	Using where
-2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	#	
+2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	#	NULL
 select * from t2 where p NOT IN (select p from t1) order by p;
 p	u	o
 4	4	4
@@ -20,7 +20,7 @@ p	u	o
 explain select * from t2 where p NOT IN (select u from t1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	#	Using where
-2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	#	
+2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	#	NULL
 select * from t2 where p NOT IN (select u from t1) order by p;
 p	u	o
 4	4	4
@@ -28,7 +28,7 @@ p	u	o
 explain select * from t2 where p NOT IN (select o from t1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	#	Using where
-2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	#	
+2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	#	NULL
 select * from t2 where p NOT IN (select o from t1) order by p;
 p	u	o
 4	4	4
@@ -36,7 +36,7 @@ p	u	o
 explain select * from t2 where p NOT IN (select p+0 from t1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	#	Using where
-2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	#	
+2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	#	NULL
 select * from t2 where p NOT IN (select p+0 from t1) order by p;
 p	u	o
 4	4	4

No bundle (reason: useless for push emails).