Merge lp:~akopytov/percona-server/bug857590-5.5 into lp:percona-server/5.5

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/Percona%20Server%205.5/job/percona-server-5.5-param/132/

[Laurynas Biveinis (laurynas-biveinis)]

LGTM

review: Approve

[Alexey Kopytov (akopytov)]

As discussed with Laurynas, it would be good to have a second reviewer for this MP.

[Oleg Tsarev (tsarev)]

Fix looks fine.

review: Approve

=== modified file 'patches/innodb_expand_fast_index_creation.patch'
--- patches/innodb_expand_fast_index_creation.patch	2011-09-22 11:49:13 +0000
+++ patches/innodb_expand_fast_index_creation.patch	2011-09-23 20:32:35 +0000
@@ -1121,3 +1121,86 @@
    }
    else
    {
+--- /dev/null
++++ b/mysql-test/r/percona_innodb_expand_fast_index_creation.result
+@@ -0,0 +1,32 @@
++CREATE TABLE t1(
++id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
++a CHAR(1) NOT NULL,
++b CHAR(36) NOT NULL) ENGINE=InnoDB;
++INSERT INTO t1(a,b) VALUES ('a','b');
++INSERT INTO t1(a,b) SELECT a,b FROM t1;
++INSERT INTO t1(a,b) SELECT a,b FROM t1;
++INSERT INTO t1(a,b) SELECT a,b FROM t1;
++INSERT INTO t1(a,b) SELECT a,b FROM t1;
++ALTER TABLE t1 ADD KEY (a);
++EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b;
++id	1
++select_type	SIMPLE
++table	t1
++type	ALL
++possible_keys	a
++key	NULL
++key_len	NULL
++ref	NULL
++rows	16
++Extra	
++id	1
++select_type	SIMPLE
++table	t2
++type	ALL
++possible_keys	a
++key	NULL
++key_len	NULL
++ref	NULL
++rows	16
++Extra	Using where; Using join buffer
++DROP TABLE t1;
+--- /dev/null
++++ b/mysql-test/t/percona_innodb_expand_fast_index_creation.test
+@@ -0,0 +1,23 @@
++--source include/have_innodb.inc
++
++########################################################################
++# Bug #857590: Fast index creation does not update index statistics
++########################################################################
++
++CREATE TABLE t1(
++       id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
++       a CHAR(1) NOT NULL,
++       b CHAR(36) NOT NULL) ENGINE=InnoDB;
++
++INSERT INTO t1(a,b) VALUES ('a','b');
++INSERT INTO t1(a,b) SELECT a,b FROM t1;
++INSERT INTO t1(a,b) SELECT a,b FROM t1;
++INSERT INTO t1(a,b) SELECT a,b FROM t1;
++INSERT INTO t1(a,b) SELECT a,b FROM t1;
++
++ALTER TABLE t1 ADD KEY (a);
++
++--vertical_results
++EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b;
++
++DROP TABLE t1;
+--- a/storage/innobase/row/row0merge.c
++++ b/storage/innobase/row/row0merge.c
+@@ -2672,6 +2672,8 @@
+ 		}
+ 	}
+ 
++	dict_update_statistics(new_table, FALSE, TRUE);
++
+ func_exit:
+ 	row_merge_file_destroy_low(tmpfd);
+ 
+--- a/mysql-test/suite/innodb/r/innodb-index.result
++++ b/mysql-test/suite/innodb/r/innodb-index.result
+@@ -877,7 +877,7 @@
+ 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';