Merge lp:~laurynas-biveinis/percona-server/BT-16274-bug1082437-5.5 into lp:percona-server/5.5

[Laurynas Biveinis]

Merge bug 1082437 fix from 5.1
http://jenkins.percona.com/job/percona-server-5.5-param/587/
16274

[Stewart Smith (stewart)]

review: Approve

=== modified file 'Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp.result	2013-01-22 16:32:44 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp.result	2013-01-31 11:57:22 +0000
@@ -32,27 +32,16 @@
 INSERT INTO t2 VALUES (1),(2),(3),(4),(5);
 ib_modified_log_1
 ib_modified_log_2
-SET GLOBAL INNODB_FAST_SHUTDOWN=2;
 4th restart
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
 ib_modified_log_1
 ib_modified_log_2
-ib_modified_log_3
 5th restart
 INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
 ib_modified_log_1
+6th restart
+call mtr.add_suppression("InnoDB: Warning: truncated block detected.*");
+ib_modified_log_1
 ib_modified_log_2
 7th restart
-INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
-ib_modified_log_1
-8th restart
-call mtr.add_suppression("InnoDB: Warning: truncated block detected.*");
-ib_modified_log_1
-ib_modified_log_2
-9th restart
-INSERT INTO t1 SELECT x FROM t1;
-ERROR HY000: Lost connection to MySQL server during query
-INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
-ib_modified_log_1
-ib_modified_log_2
-10th restart
 DROP TABLE t1, t2;

=== added file 'Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_crash.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_crash.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_crash.result	2013-01-31 11:57:22 +0000
@@ -0,0 +1,35 @@
+RESET CHANGED_PAGE_BITMAPS;
+DROP TABLE IF EXISTS t1, t2;
+CREATE TABLE t1 (x INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+CREATE TABLE t2 (x INT) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (1),(2),(3),(4),(5);
+SET GLOBAL INNODB_FAST_SHUTDOWN=2;
+1st restart
+ib_modified_log_1
+ib_modified_log_2
+2nd restart
+INSERT INTO t1 SELECT x FROM t1;
+ERROR HY000: Lost connection to MySQL server during query
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+ib_modified_log_1
+ib_modified_log_2
+ib_modified_log_3
+DROP TABLE t1, t2;

=== removed file 'Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_no_restart.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_no_restart.result	2013-01-22 16:32:44 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_no_restart.result	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-RESET CHANGED_PAGE_BITMAPS;
-DROP TABLE IF EXISTS t1, t2;
-CREATE TABLE t1 (x INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
-CREATE TABLE t2 (x INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1),(2),(3),(4),(5);
-ib_modified_log_1
-DROP TABLE t1, t2;

=== modified file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp-master.opt'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp-master.opt	2012-08-22 07:21:28 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp-master.opt	2013-01-31 11:57:22 +0000
@@ -1,1 +1,1 @@
---innodb_track_changed_pages=TRUE --innodb_log_file_size=5M --innodb_file_per_table --skip-stack-trace --skip-core-file
+--innodb_track_changed_pages=TRUE --innodb_log_file_size=5M --innodb_file_per_table 

=== modified file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp.test	2013-01-22 16:32:44 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp.test	2013-01-31 11:57:22 +0000
@@ -6,12 +6,7 @@
 # a checkpoint deterministically without generating a bunch of log data and restarts (which
 # then cause bitmap file rotations on their own).
 
---source include/not_embedded.inc
---source include/not_crashrep.inc
---source include/have_debug.inc
 --source include/have_innodb.inc
-# Valgrind reports useless errors on very fast server shutdowns
---source include/not_valgrind.inc
 
 # Delete any existing bitmaps
 --source include/restart_mysqld.inc
@@ -111,33 +106,17 @@
 list_files $MYSQLD_DATADIR ib_modified_log*;
 
 #
-# Test the very fast server shutdown
-# 
-
-SET GLOBAL INNODB_FAST_SHUTDOWN=2;
-
+# Test that an empty existing bitmap file is handled properly when it's impossible to re-read the full missing range.
+#
+
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+remove_files_wildcard $MYSQLD_DATADIR ib_modified_log*;
+write_file $BITMAP_FILE;
+EOF
+--enable_reconnect
 --echo 4th restart
---source include/restart_mysqld.inc
-
-# TODO: check the tracked LSN range continuity once this info is exposed through
-# INFORMATION_SCHEMA.
-
-file_exists $BITMAP_FILE;
---replace_regex /_[[:digit:]]+\.xdb$//
-list_files $MYSQLD_DATADIR ib_modified_log*;
-
-#
-# Test that an empty existing bitmap file is handled properly when it's impossible to re-read the full missing range.
-#
-
---exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---shutdown_server 10
---source include/wait_until_disconnected.inc
-remove_files_wildcard $MYSQLD_DATADIR ib_modified_log*;
-write_file $BITMAP_FILE;
-EOF
---enable_reconnect
---echo 5th restart
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --source include/wait_until_connected_again.inc
 
@@ -157,7 +136,7 @@
 --source include/wait_until_disconnected.inc
 remove_files_wildcard $MYSQLD_DATADIR ib_modified_log*;
 --enable_reconnect
---echo 7th restart
+--echo 5th restart
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --source include/wait_until_connected_again.inc
 
@@ -174,7 +153,7 @@
 junk junk junk junk
 EOF
 --enable_reconnect
---echo 8th restart
+--echo 6th restart
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --source include/wait_until_connected_again.inc
 call mtr.add_suppression("InnoDB: Warning: truncated block detected.*");
@@ -187,32 +166,6 @@
 list_files $MYSQLD_DATADIR ib_modified_log*;
 
 #
-# Test crash right before writing of new bitmap data
-#
-
---exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---shutdown_server 10
---source include/wait_until_disconnected.inc
---enable_reconnect
---exec echo "restart:-#d,crash_before_bitmap_write" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---source include/wait_until_connected_again.inc
---echo 9th restart
---exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---error 2013
-INSERT INTO t1 SELECT x FROM t1;
---enable_reconnect
---source include/wait_until_connected_again.inc
-
-INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
-
-file_exists $BITMAP_FILE;
---replace_regex /_[[:digit:]]+\.xdb$//
-list_files $MYSQLD_DATADIR ib_modified_log*;
-
-# TODO: check the tracked LSN range continuity once this info is exposed through
-# INFORMATION_SCHEMA.
-
-#
 # Test that last tracked LSN is determined correctly when the last bitmap file is fully
 # corrupted
 #
@@ -241,7 +194,7 @@
 source $MYSQLD_DATADIR/corrupt_bmp_2.inc;
 remove_file $MYSQLD_DATADIR/corrupt_bmp_2.inc;
 --enable_reconnect
---echo 10th restart
+--echo 7th restart
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --source include/wait_until_connected_again.inc
 

=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_crash-master.opt'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_crash-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_crash-master.opt	2013-01-31 11:57:22 +0000
@@ -0,0 +1,1 @@
+--innodb_track_changed_pages=TRUE --innodb_log_file_size=5M --innodb_file_per_table --skip-stack-trace --skip-core-file

=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_crash.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_crash.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_crash.test	2013-01-31 11:57:22 +0000
@@ -0,0 +1,85 @@
+#
+# Tests for the changed page tracking bitmap crash recovery and very fast shutdowns
+#
+--source include/have_innodb.inc
+--source include/not_embedded.inc
+--source include/not_crashrep.inc
+--source include/have_debug.inc
+--source include/not_valgrind.inc
+
+# Delete any existing bitmaps
+--source include/restart_mysqld.inc
+RESET CHANGED_PAGE_BITMAPS;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1, t2;
+--enable_warnings
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+let $BITMAP_FILE= $MYSQLD_DATADIR/ib_modified_log_1_0.xdb;
+
+# Generate log data that is larger than the log capacity and has two tablespace ids.
+CREATE TABLE t1 (x INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+INSERT INTO t1 SELECT x FROM t1;
+CREATE TABLE t2 (x INT) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (1),(2),(3),(4),(5);
+
+#
+# Test the very fast server shutdown
+#
+SET GLOBAL INNODB_FAST_SHUTDOWN=2;
+
+--echo 1st restart
+--source include/restart_mysqld.inc
+
+# TODO: check the tracked LSN range continuity once this info is exposed through
+# INFORMATION_SCHEMA.
+
+file_exists $BITMAP_FILE;
+--replace_regex /_[[:digit:]]+\.xdb$//
+list_files $MYSQLD_DATADIR ib_modified_log*;
+
+#
+# Test crash right before writing of new bitmap data
+#
+
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+--enable_reconnect
+--exec echo "restart:-#d,crash_before_bitmap_write" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+--echo 2nd restart
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--error 2013
+INSERT INTO t1 SELECT x FROM t1;
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
+
+file_exists $BITMAP_FILE;
+--replace_regex /_[[:digit:]]+\.xdb$//
+list_files $MYSQLD_DATADIR ib_modified_log*;
+
+# TODO: check the tracked LSN range continuity once this info is exposed through
+# INFORMATION_SCHEMA.
+
+DROP TABLE t1, t2;

=== removed file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_no_restart-master.opt'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_no_restart-master.opt	2012-08-22 07:21:28 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_no_restart-master.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---innodb_track_changed_pages=TRUE --innodb-file-per-table

=== removed file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_no_restart.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_no_restart.test	2013-01-22 16:32:44 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_no_restart.test	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-# Tests for the changed page tracking bitmap. A valgrindable subset of
-# percona_changed_page_bmp test, which contains the full functional tests.
---source include/have_innodb.inc
-
-# Delete any existing bitmaps
---source include/restart_mysqld.inc
-RESET CHANGED_PAGE_BITMAPS;
-
---disable_warnings
-DROP TABLE IF EXISTS t1, t2;
---enable_warnings
-
-let $MYSQLD_DATADIR= `select @@datadir`;
-let $BITMAP_FILE= $MYSQLD_DATADIR/ib_modified_log_1_0.xdb;
-
-# Create some log data with several space ids to have more than bitmap poge.
-CREATE TABLE t1 (x INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
-CREATE TABLE t2 (x INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1),(2),(3),(4),(5);
-
-# Check that the bitmap file has been created
-file_exists $BITMAP_FILE;
-
---replace_regex /_[[:digit:]]+\.xdb$//
-list_files $MYSQLD_DATADIR ib_modified_log*;
-
-# TODO: check the tracked LSN range continuity once this info is exposed through
-# INFORMATION_SCHEMA.
-
-DROP TABLE t1, t2;