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

[Laurynas Biveinis]

    Fix bug 999147 (A crash that leaves behind an InnoDB temporary table
    with indexes results in an unbootable server).

    The issue happens on server start up if there exists a temporary table
    from the crashed session that has a temporary index on it. Then
    row_merge_drop_temp_indexes() will load the table into the dictionary
    cache in order to drop the index. Later row_mysql_drop_temp_tables()
    will try to load exact same table again and will be unable to handle
    that the table is already loaded.

    The only place in InnoDB that uses temporary indexes is the regular
    table index creation and drop. This code however is not used for the
    temporary tables, as they are created anew with the final index
    definitions and then data is copied.

    However the Percona Server expanded index creation might use the
    regular index creation and drop code path in a case with
    expanded fast index creation enabled: when there is an
    already-existing secondary index on the table, it will be dropped from
    the new temp table and recreated after copying the data.

    The fix is in row_mysql_drop_temp_tables(): replace the
    dict_load_table() call with a dict_table_get_low() call that will
    check the cache and call the former only if needed.

    For testing we need to crash the server when the temporary index is
    present. For that, add a new crash injection site
    "crash_innodb_add_index_after" at the end of non-error
    ha_innobase::add_index() code path.

    Add a new test case percona_bug_999147.

[Laurynas Biveinis (laurynas-biveinis)]

Issue #23438.

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

[Alexey Kopytov (akopytov)]

Laurynas,

The patch looks good, thank you!

However it's not obvious why the bug is invalid for 5.1?

review: Approve

[Laurynas Biveinis (laurynas-biveinis)]

Alexey -

Thanks.

"Invalid for 5.1" was due to my mistaken impression that the expanded fast index creation is unavailable in 5.1. Fixed now.

=== added file 'Percona-Server/mysql-test/suite/innodb/r/percona_bug_999147.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_bug_999147.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_bug_999147.result	2012-05-16 08:23:21 +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));
+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, FLAG FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES;
+NAME	FLAG
+SYS_FOREIGN	0
+SYS_FOREIGN_COLS	0

=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_bug_999147-master.opt'
--- Percona-Server/mysql-test/suite/innodb/t/percona_bug_999147-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_bug_999147-master.opt	2012-05-16 08:23:21 +0000
@@ -0,0 +1,1 @@
+--skip-stack-trace --skip-core-file --innodb-file-per-table=1

=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_bug_999147.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_bug_999147.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_bug_999147.test	2012-05-16 08:23:21 +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));
+
+--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, FLAG FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES;

=== modified file 'Percona-Server/storage/innobase/handler/handler0alter.cc'
--- Percona-Server/storage/innobase/handler/handler0alter.cc	2012-05-02 07:37:27 +0000
+++ Percona-Server/storage/innobase/handler/handler0alter.cc	2012-05-16 08:23:21 +0000
@@ -877,6 +877,8 @@
 					prebuilt->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/innobase/row/row0mysql.c'
--- Percona-Server/storage/innobase/row/row0mysql.c	2012-05-02 07:37:27 +0000
+++ Percona-Server/storage/innobase/row/row0mysql.c	2012-05-16 08:23:21 +0000
@@ -3689,7 +3689,7 @@
 		btr_pcur_store_position(&pcur, &mtr);
 		btr_pcur_commit_specify_mtr(&pcur, &mtr);
 
-		table = dict_load_table(table_name, TRUE, DICT_ERR_IGNORE_NONE);
+		table = dict_table_get_low(table_name);
 
 		if (table) {
 			row_drop_table_for_mysql(table_name, trx, FALSE);