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

[Laurynas Biveinis]

2nd MP:
http://jenkins.percona.com/job/percona-server-5.6-param/450/

1st MP:

Trivially merge bug 1260035 fix from 5.5.

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

[George Ormond Lorch III (gl-az)]

review: Approve (g2)

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_requests.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_requests.result	2013-01-22 16:32:44 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_requests.result	2013-12-15 13:06:21 +0000
@@ -19,11 +19,13 @@
 ib_modified_log_2
 PURGE CHANGED_PAGE_BITMAPS BEFORE 1;
 After PURGE ... BEFORE 1:
+ib_modified_log_1
 ib_modified_log_2
 PURGE CHANGED_PAGE_BITMAPS BEFORE 100000000;
 PURGE CHANGED_PAGE_BITMAPS BEFORE 100000000;
 INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
 After PURGE ... BEFORE 100000000 and restart:
+ib_modified_log_3
 ib_modified_log_4
 ib_modified_log_5
 PURGE CHANGED_PAGE_BITMAPS BEFORE 5+5;
@@ -55,22 +57,43 @@
 0
 FLUSH CHANGED_PAGE_BITMAPS;
 Before the PURGE with tracking disabled
+ib_modified_log_3
 ib_modified_log_4
 ib_modified_log_5
 PURGE CHANGED_PAGE_BITMAPS BEFORE 1;
 After the PURGE that deletes nothing:
+ib_modified_log_3
 ib_modified_log_4
 ib_modified_log_5
 PURGE CHANGED_PAGE_BITMAPS BEFORE 100000000;
-After the PURGE that deletes everything:
+After the PURGE that deletes everything but the last file:
+ib_modified_log_5
 PURGE CHANGED_PAGE_BITMAPS BEFORE 100000000;
 After the repeated PURGE:
+ib_modified_log_5
+call mtr.add_suppression("last tracked LSN");
 INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
 Before the RESET while tracking disabled:
-ib_modified_log_1
-ib_modified_log_2
+ib_modified_log_5
+ib_modified_log_6
+ib_modified_log_7
 RESET CHANGED_PAGE_BITMAPS;
 After the RESET with tracking disabled:
+Created dummy bitmap files
+ib_modified_log_1_0.xdb
+ib_modified_log_2_100.xdb
+ib_modified_log_3_200.xdb
+ib_modified_log_4_300.xdb
+PURGE CHANGED_PAGE_BITMAPS BEFORE 99;
+ib_modified_log_1_0.xdb
+ib_modified_log_2_100.xdb
+ib_modified_log_3_200.xdb
+ib_modified_log_4_300.xdb
+PURGE CHANGED_PAGE_BITMAPS BEFORE 200;
+ib_modified_log_3_200.xdb
+ib_modified_log_4_300.xdb
+PURGE CHANGED_PAGE_BITMAPS BEFORE 500;
+ib_modified_log_4_300.xdb
 DROP TABLE t1;
 CREATE TABLE CHANGED_PAGE_BITMAPS (a INT);
 DROP TABLE CHANGED_PAGE_BITMAPS;

=== modified file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_requests.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_requests.test	2013-01-22 16:32:44 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_requests.test	2013-12-15 13:06:21 +0000
@@ -4,7 +4,7 @@
 --source include/have_innodb.inc
 
 # Delete any existing bitmaps
---source include/restart_mysqld.inc
+
 RESET CHANGED_PAGE_BITMAPS;
 
 --source include/count_sessions.inc
@@ -57,8 +57,7 @@
 list_files $MYSQLD_DATADIR ib_modified_log*;
 
 #
-# Test that PURGE CHANGED_PAGE_BITMAPS BEFORE works.  We don't test partial PURGE
-# because it's hard to extract good LSN value for that.
+# Test that PURGE CHANGED_PAGE_BITMAPS BEFORE works.
 #
 
 # PURGE that deletes nothing
@@ -67,7 +66,7 @@
 --replace_regex /_[[:digit:]]+\.xdb$//
 list_files $MYSQLD_DATADIR ib_modified_log*;
 
-# PURGE that deletes everything
+# PURGE that deletes everything but the last file
 PURGE CHANGED_PAGE_BITMAPS BEFORE 100000000;
 # Test consecutive PURGE
 PURGE CHANGED_PAGE_BITMAPS BEFORE 100000000;
@@ -155,7 +154,7 @@
 
 PURGE CHANGED_PAGE_BITMAPS BEFORE 100000000;
 
---echo After the PURGE that deletes everything:
+--echo After the PURGE that deletes everything but the last file:
 --replace_regex /_[[:digit:]]+\.xdb$//
 list_files $MYSQLD_DATADIR ib_modified_log*;
 
@@ -166,10 +165,11 @@
 list_files $MYSQLD_DATADIR ib_modified_log*;
 
 #
-# Test RESET request with log tracking disabled
+# Test requests with log tracking disabled
 #
 
 # Generate some bitmap data again
+call mtr.add_suppression("last tracked LSN");
 --source include/restart_mysqld.inc
 INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
 --source include/restart_mysqld.inc
@@ -191,6 +191,35 @@
 --replace_regex /_[[:digit:]]+\.xdb$//
 list_files $MYSQLD_DATADIR ib_modified_log*;
 
+#
+# Bug 1260035: test PURGE with a range end in a middle of a file. 
+#
+
+# Create some dummy bitmaps
+write_file $MYSQLD_DATADIR/ib_modified_log_1_0.xdb;
+EOF
+write_file $MYSQLD_DATADIR/ib_modified_log_2_100.xdb;
+EOF
+write_file $MYSQLD_DATADIR/ib_modified_log_3_200.xdb;
+EOF
+write_file $MYSQLD_DATADIR/ib_modified_log_4_300.xdb;
+EOF
+
+--echo Created dummy bitmap files
+list_files $MYSQLD_DATADIR ib_modified_log*;
+
+PURGE CHANGED_PAGE_BITMAPS BEFORE 99;
+list_files $MYSQLD_DATADIR ib_modified_log*;
+
+PURGE CHANGED_PAGE_BITMAPS BEFORE 200;
+list_files $MYSQLD_DATADIR ib_modified_log*;
+
+PURGE CHANGED_PAGE_BITMAPS BEFORE 500;
+list_files $MYSQLD_DATADIR ib_modified_log*;
+
+# Cleanup
+remove_file $MYSQLD_DATADIR/ib_modified_log_4_300.xdb;
+
 DROP TABLE t1;
 
 #

=== modified file 'Percona-Server/storage/innobase/log/log0online.cc'
--- Percona-Server/storage/innobase/log/log0online.cc	2013-09-25 06:04:21 +0000
+++ Percona-Server/storage/innobase/log/log0online.cc	2013-12-15 13:06:21 +0000
@@ -1782,7 +1782,7 @@
 		mutex_enter(&log_bmp_sys->mutex);
 	}
 
-	if (!log_online_setup_bitmap_file_range(&bitmap_files, 0, lsn)) {
+	if (!log_online_setup_bitmap_file_range(&bitmap_files, 0, LSN_MAX)) {
 		if (srv_track_changed_pages) {
 			mutex_exit(&log_bmp_sys->mutex);
 		}
@@ -1797,8 +1797,19 @@
 	}
 
 	for (i = 0; i < bitmap_files.count; i++) {
-		if (bitmap_files.files[i].seq_num == 0
-		    || bitmap_files.files[i].start_lsn >= lsn) {
+
+		/* We consider the end LSN of the current bitmap, derived from
+		the start LSN of the subsequent bitmap file, to determine
+		whether to remove the current bitmap.  Note that bitmap_files
+		does not contain an entry for the bitmap past the given LSN so
+		we must check the boundary conditions as well.  For example,
+		consider 1_0.xdb and 2_10.xdb and querying LSN 5.  bitmap_files
+		will only contain 1_0.xdb and we must not delete it since it
+		represents LSNs 0-9. */
+		if ((i + 1 == bitmap_files.count
+		     || bitmap_files.files[i + 1].seq_num == 0
+		     || bitmap_files.files[i + 1].start_lsn > lsn)
+		    && (lsn != LSN_MAX)) {
 
 			break;
 		}