Merge lp:~laurynas-biveinis/percona-server/bug1382336-5.6 into lp:percona-server/5.6

[Laurynas Biveinis]

Automerge

http://jenkins.percona.com/job/percona-server-5.6-param/737/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== added file 'mysql-test/suite/innodb/r/percona_changed_page_bmp_requests_debug.result'
--- mysql-test/suite/innodb/r/percona_changed_page_bmp_requests_debug.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/innodb/r/percona_changed_page_bmp_requests_debug.result	2014-10-17 06:11:15 +0000
@@ -0,0 +1,9 @@
+CREATE TABLE t1(a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (10);
+SET @@GLOBAL.innodb_log_checkpoint_now=TRUE;
+SET @@GLOBAL.innodb_track_redo_log_now=TRUE;
+PURGE CHANGED_PAGE_BITMAPS BEFORE CURRENT_LSN;
+INSERT INTO t1 VALUES (20);
+SET @@GLOBAL.innodb_log_checkpoint_now=TRUE;
+SET @@GLOBAL.innodb_track_redo_log_now=TRUE;
+DROP TABLE t1;

=== added file 'mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_debug-master.opt'
--- mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_debug-master.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_debug-master.opt	2014-10-17 06:11:15 +0000
@@ -0,0 +1,1 @@
+--innodb_track_changed_pages=TRUE

=== added file 'mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_debug.test'
--- mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_debug.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/innodb/t/percona_changed_page_bmp_requests_debug.test	2014-10-17 06:11:15 +0000
@@ -0,0 +1,27 @@
+#
+# Tests for changed page tracking user requests that need a debug build
+#
+--source include/have_innodb.inc
+--source include/have_debug.inc
+
+#
+# Bug 1382336: Purging bitmaps exactly up to the last tracked LSN aborts change tracking
+#
+CREATE TABLE t1(a INT) ENGINE=InnoDB;
+
+INSERT INTO t1 VALUES (10);
+
+SET @@GLOBAL.innodb_log_checkpoint_now=TRUE;
+SET @@GLOBAL.innodb_track_redo_log_now=TRUE;
+
+let $current_lsn = query_get_value(SHOW STATUS LIKE 'innodb_lsn_current', Value, 1);
+
+--replace_regex /[0-9]+/CURRENT_LSN/
+eval PURGE CHANGED_PAGE_BITMAPS BEFORE $current_lsn;
+
+INSERT INTO t1 VALUES (20);
+
+SET @@GLOBAL.innodb_log_checkpoint_now=TRUE;
+SET @@GLOBAL.innodb_track_redo_log_now=TRUE;
+
+DROP TABLE t1;

=== modified file 'storage/innobase/log/log0online.cc'
--- storage/innobase/log/log0online.cc	2014-08-22 13:31:49 +0000
+++ storage/innobase/log/log0online.cc	2014-10-17 06:11:15 +0000
@@ -1808,7 +1808,7 @@
 		return TRUE;
 	}
 
-	if (srv_track_changed_pages && lsn >= log_bmp_sys->end_lsn) {
+	if (srv_track_changed_pages && lsn > log_bmp_sys->end_lsn) {
 		/* If we have to delete the current output file, close it
 		first. */
 		os_file_close(log_bmp_sys->out.file);