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

[Laurynas Biveinis]

Automerge bug 1083596 fix from 5.1.
http://jenkins.percona.com/job/percona-server-5.5-param/588/
16274

[Stewart Smith (stewart)]

review: Approve

[Stewart Smith (stewart)]

http://jenkins.percona.com/view/Merge/job/merge-PS-5.5-staging/27/BUILD_TYPE=release,Host=ubuntu-lucid-32bit/testReport/junit/%28root%29/innodb/percona_changed_page_bmp_2/

Logfile:
CURRENT_TEST: innodb.percona_changed_page_bmp
mysqltest: At line 221: query 'RESET ALL CHANGED PAGE BITMAPS' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ALL CHANGED PAGE BITMAPS' at line 1

[Laurynas Biveinis (laurynas-biveinis)]

Fixed.

=== 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-31 11:52:07 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp.result	2013-02-04 11:31:24 +0000
@@ -44,4 +44,11 @@
 ib_modified_log_1
 ib_modified_log_2
 7th restart
+ib_modified_log_1
+ib_modified_log_2
+ib_modified_log_3
+8th restart
+RESET CHANGED_PAGE_BITMAPS;
+call mtr.add_suppression("InnoDB: Error: page [0-9]* log sequence number [0-9]*");
+9th restart
 DROP TABLE t1, t2;

=== 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-31 11:52:07 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp.test	2013-02-04 11:31:24 +0000
@@ -198,4 +198,30 @@
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --source include/wait_until_connected_again.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 for log tracking compatibility with innodb_force_recovery (bug 1083596).
+#
+
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+--enable_reconnect
+--echo 8th restart
+--exec echo "restart:--innodb-force-recovery=6" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+# innodb_force_recovery desyncs bitmap data and logs
+RESET CHANGED_PAGE_BITMAPS;
+
+call mtr.add_suppression("InnoDB: Error: page [0-9]* log sequence number [0-9]*");
+--echo 9th restart
+--source include/restart_mysqld.inc
+
 DROP TABLE t1, t2;

=== modified file 'Percona-Server/storage/innobase/log/log0online.c'
--- Percona-Server/storage/innobase/log/log0online.c	2013-01-22 16:32:44 +0000
+++ Percona-Server/storage/innobase/log/log0online.c	2013-02-04 11:31:24 +0000
@@ -413,8 +413,10 @@
 
 	if (last_tracked_lsn > tracking_start_lsn) {
 		fprintf(stderr,
-			"InnoDB: Error: last tracked LSN is in future.  This "
-			"can be caused by mismatched bitmap files.\n");
+			"InnoDB: Error: last tracked LSN %llu is ahead of "
+			"tracking start LSN %llu.  This can be caused by "
+			"mismatched bitmap files.\n", last_tracked_lsn,
+			tracking_start_lsn);
 		exit(1);
 	}
 

=== modified file 'Percona-Server/storage/innobase/srv/srv0start.c'
--- Percona-Server/storage/innobase/srv/srv0start.c	2012-11-25 09:30:58 +0000
+++ Percona-Server/storage/innobase/srv/srv0start.c	2013-02-04 11:31:24 +0000
@@ -1155,6 +1155,11 @@
 init_log_online(void)
 /*=================*/
 {
+	if (UNIV_UNLIKELY(srv_force_recovery > 0)) {
+		srv_track_changed_pages = FALSE;
+		return;
+	}
+
 	if (srv_track_changed_pages) {
 
 		log_online_read_init();