From: Sergey Glukhov
Date: October 29 2012 10:44am
Subject: bzr push into mysql-trunk branch (sergey.glukhov:4842 to 4843)
List-Archive: http://lists.mysql.com/commits/145318
Message-Id: <201210291043.q9TAhuig009917@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4843 Sergey Glukhov	2012-10-29
      Updated result file, key length is increased due to wl6266.
     @ mysql-test/r/index_merge_innodb.result
        Updated result file, key length is increased due to wl6266.

    modified:
      mysql-test/r/index_merge_innodb.result
 4842 Annamalai Gurusami	2012-10-29 [merge]
      Null merge from mysql-5.6 to mysql-5.7. 

=== modified file 'mysql-test/r/index_merge_innodb.result'
--- a/mysql-test/r/index_merge_innodb.result	2012-08-03 09:25:16 +0000
+++ b/mysql-test/r/index_merge_innodb.result	2012-10-29 10:43:53 +0000
@@ -1425,7 +1425,7 @@ id	select_type	table	type	possible_keys	
 1	SIMPLE	t1	ref	key1	key1	4	const	ROWS	Using where
 explain select * from t1 where pk1 < 7500 and key1 = 10;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index_merge	PRIMARY,key1	key1,PRIMARY	4,4	NULL	ROWS	Using intersect(key1,PRIMARY); Using where
+1	SIMPLE	t1	index_merge	PRIMARY,key1	key1,PRIMARY	8,4	NULL	ROWS	Using intersect(key1,PRIMARY); Using where
 explain select * from t1 where pktail1ok=1 and key1=10;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index_merge	key1,pktail1ok	key1,pktail1ok	4,4	NULL	1	Using intersect(key1,pktail1ok); Using where

No bundle (reason: useless for push emails).