From: Jon Olav Hauglid
Date: October 24 2011 1:25pm
Subject: bzr push into mysql-trunk-wl5534 branch (jon.hauglid:3410 to 3411) WL#5534
List-Archive: http://lists.mysql.com/commits/141569
Message-Id: <201110241325.p9ODPkWx017111@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3411 Jon Olav Hauglid	2011-10-24
      WL#5534 Online ALTER, Phase 1.
        
      Patch #37:
      Updated result file for innodb.innodb-index.test.
      
      The change of behavior occurs after
        alter table t1 add primary key (a,b(255),c(255)),
        add key (b(767));
      now uses in-place alter rather than the copy algorithm.
      It seems index statistics are not generated properly,
      unrelated to WL#5534. See Bug#13248866.

    modified:
      mysql-test/suite/innodb/r/innodb-index.result
 3410 Jon Olav Hauglid	2011-10-22
      WL#5534 Online ALTER, Phase 1.
        
      Patch #36:
      Revert locking changes for ALTER_EXCHANGE_PARTITION.

    modified:
      sql/sql_partition_admin.cc
      sql/sql_yacc.yy
=== modified file 'mysql-test/suite/innodb/r/innodb-index.result'
--- a/mysql-test/suite/innodb/r/innodb-index.result	2011-09-26 07:19:04 +0000
+++ b/mysql-test/suite/innodb/r/innodb-index.result	2011-10-24 13:25:09 +0000
@@ -951,7 +951,7 @@ Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 explain select * from t1 where b like 'adfd%';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	b	NULL	NULL	NULL	15	Using where
+1	SIMPLE	t1	range	b	b	769	NULL	11	Using where
 drop table t1;
 set global innodb_file_per_table=on;
 set global innodb_file_format='Barracuda';

No bundle (reason: useless for push emails).