Merge lp:~sergei.glushchenko/percona-server/56-bug1133926 into lp:percona-server/5.6

[Sergei Glushchenko]

percona_bug_999147 fails on debug builds.
Following can be found in server logs:
handler0alter.cc:368: virtual enum_alter_inplace_result ha_innobase::check_if_supported_inplace_alter(TABLE*, Alter_inplace_info*): Assertion `key_part->fieldnr < altered_table->s->fields' failed.
The reason is that key parts with 1-based fieldnr been passed to
check_if_supported_inplace_alter but 0-based are expected.
Solution is to transform keyparts with 1-based fieldnr (obtained from
table->key_info) to keyparts with 0-based fieldnr.

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/49/

[Stewart Smith (stewart)]

review: Approve

=== added file 'Percona-Server/mysql-test/suite/innodb/r/percona_bug_1133926.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_bug_1133926.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_bug_1133926.result	2013-03-04 14:51:25 +0000
@@ -0,0 +1,4 @@
+DROP TABLE IF EXISTS t1;
+SET SESSION expand_fast_index_creation=ON;
+CREATE TEMPORARY TABLE t1 (a INT, b INT, INDEX z(a));
+ALTER TABLE t1 ADD INDEX y(b);

=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_bug_1133926.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_bug_1133926.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_bug_1133926.test	2013-03-04 14:51:25 +0000
@@ -0,0 +1,19 @@
+# Test for Percona Server bug 1133926 (A crash that leaves behind an
+# InnoDB temporary table with indexes results in an unbootable server)
+# https://bugs.launchpad.net/percona-server/+bug/1133926
+
+-- source include/not_embedded.inc
+-- source include/not_valgrind.inc
+-- source include/not_crashrep.inc
+-- source include/have_debug.inc
+-- source include/have_innodb.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+SET SESSION expand_fast_index_creation=ON;
+
+CREATE TEMPORARY TABLE t1 (a INT, b INT, INDEX z(a));
+
+ALTER TABLE t1 ADD INDEX y(b);

=== modified file 'Percona-Server/sql/sql_table.cc'
--- Percona-Server/sql/sql_table.cc	2013-02-12 07:47:19 +0000
+++ Percona-Server/sql/sql_table.cc	2013-03-04 14:51:25 +0000
@@ -7555,7 +7555,6 @@
   DBUG_RETURN(error != 0);
 }
 
-
 /*
   Temporarily remove secondary keys previously stored in
   alter_info->delayed_key_info.
@@ -7576,7 +7575,7 @@
 
   /*
     Create Alter_info for the table and fill create_list with fields
-    definitions. Not that fields not changed, so we set field==ogrig_field.
+    definitions. Note that fields not changed, so we set field==ogrig_field.
   */
   Alter_info alter_info_new;
   Field **f_ptr, *field;
@@ -7587,8 +7586,27 @@
     alter_info_new.create_list.push_back(new_field);
   }
 
+  /* table->key_info cannot be passed to ha_alter_info constructor,
+     because it has 1-based fieldnr in key_parts while ha_alter_info
+     expect them to be 0-based */
+  KEY* key_buf= (KEY*) thd->alloc(sizeof(KEY) * table->s->keys);
+  for (uint key_idx= 0; key_idx < table->s->keys; key_idx++) {
+    KEY* key = table->key_info + key_idx;
+    KEY_PART_INFO* key_parts_buf=
+           (KEY_PART_INFO*) thd->alloc(sizeof(KEY_PART_INFO) *
+                                       key->user_defined_key_parts);
+    for (uint key_part_idx= 0;
+         key_part_idx < key->user_defined_key_parts;
+         key_part_idx++) {
+      key_parts_buf[key_part_idx]= key->key_part[key_part_idx];
+      key_parts_buf[key_part_idx].fieldnr--;
+    }
+    key_buf[key_idx]= *key;
+    key_buf[key_idx].key_part= key_parts_buf;
+  }
+
   Alter_inplace_info ha_alter_info(create_info, &alter_info_new,
-                                     table->key_info, table->s->keys,
+                                     key_buf, table->s->keys,
 #ifdef WITH_PARTITION_STORAGE_ENGINE
                                      thd->work_part_info,
 #else