Merge lp:~laurynas-biveinis/percona-server/bug999147-5.1 into lp:percona-server/5.1

[Laurynas Biveinis]

Merge the bug 999147 fix from 5.5.
Add explicit ENGINE=InnoDB in the test case.

http://jenkins.percona.com/job/percona-server-5.1-param/318/

Issue 23438

[Alexey Kopytov (akopytov)]

review: Approve

=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/r/percona_bug_999147.result'
--- Percona-Server/mysql-test/suite/innodb_plugin/r/percona_bug_999147.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/r/percona_bug_999147.result	2012-05-17 04:39:18 +0000
@@ -0,0 +1,10 @@
+DROP TABLE IF EXISTS t1;
+SET SESSION expand_fast_index_creation=ON;
+CREATE TEMPORARY TABLE t1 (a INT, b INT, INDEX(a)) ENGINE=InnoDB;
+SET debug="+d,crash_innodb_add_index_after";
+ALTER TABLE t1 ADD INDEX (b);
+ERROR HY000: Lost connection to MySQL server during query
+SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES;
+NAME
+SYS_FOREIGN
+SYS_FOREIGN_COLS
 
=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_bug_999147-master.opt'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_bug_999147-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_bug_999147-master.opt	2012-05-17 04:39:18 +0000
@@ -0,0 +1,1 @@
+--skip-stack-trace --skip-core-file --innodb-file-per-table=1
 
=== added file 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_bug_999147.test'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_bug_999147.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_bug_999147.test	2012-05-17 04:39:18 +0000
@@ -0,0 +1,29 @@
+# Test for Percona Server bug 999147 (A crash that leaves behind an
+# InnoDB temporary table with indexes results in an unbootable server)
+# https://bugs.launchpad.net/percona-server/+bug/999147
+
+-- 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(a)) ENGINE=InnoDB;
+
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+
+SET debug="+d,crash_innodb_add_index_after";
+--error 2013
+ALTER TABLE t1 ADD INDEX (b);
+
+--enable_reconnect
+
+--source include/wait_until_connected_again.inc
+
+SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES;
 
=== modified file 'Percona-Server/storage/innodb_plugin/handler/handler0alter.cc'
--- Percona-Server/storage/innodb_plugin/handler/handler0alter.cc	2012-05-09 04:14:12 +0000
+++ Percona-Server/storage/innodb_plugin/handler/handler0alter.cc	2012-05-17 04:39:18 +0000
@@ -823,6 +823,8 @@
 					innodb_table, indexed_table,
 					index, num_of_idx, table);
 
+	DBUG_EXECUTE_IF("crash_innodb_add_index_after", DBUG_SUICIDE(););
+
 error_handling:
 	/* After an error, remove all those index definitions from the
 	dictionary which were defined. */
 
=== modified file 'Percona-Server/storage/innodb_plugin/row/row0mysql.c'
--- Percona-Server/storage/innodb_plugin/row/row0mysql.c	2012-05-09 04:14:12 +0000
+++ Percona-Server/storage/innodb_plugin/row/row0mysql.c	2012-05-17 04:39:18 +0000
@@ -3635,7 +3635,7 @@
 		btr_pcur_store_position(&pcur, &mtr);
 		btr_pcur_commit_specify_mtr(&pcur, &mtr);
 
-		table = dict_load_table(table_name);
+		table = dict_table_get_low(table_name);
 
 		if (table) {
 			row_drop_table_for_mysql(table_name, trx, FALSE);