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

[Laurynas Biveinis]

Automerge bug 1342494 fix from 5.5.

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

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== added file 'mysql-test/suite/innodb/r/percona_changed_pages_log_tracking_off.result'
--- mysql-test/suite/innodb/r/percona_changed_pages_log_tracking_off.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/innodb/r/percona_changed_pages_log_tracking_off.result	2014-07-18 13:51:04 +0000
@@ -0,0 +1,4 @@
+creating inconsistent bitmap dir: start LSN of 3rd file < start LSN of 2nd file
+call mtr.add_suppression("inconsistent bitmap file directory");
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;
+ERROR HY000: Can't read record in system table
 
=== added file 'mysql-test/suite/innodb/t/percona_changed_pages_log_tracking_off-master.opt'
--- mysql-test/suite/innodb/t/percona_changed_pages_log_tracking_off-master.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/innodb/t/percona_changed_pages_log_tracking_off-master.opt	2014-07-18 13:51:04 +0000
@@ -0,0 +1,1 @@
+--innodb-track-changed-pages=0
 
=== added file 'mysql-test/suite/innodb/t/percona_changed_pages_log_tracking_off.test'
--- mysql-test/suite/innodb/t/percona_changed_pages_log_tracking_off.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/innodb/t/percona_changed_pages_log_tracking_off.test	2014-07-18 13:51:04 +0000
@@ -0,0 +1,22 @@
+# Tests for queries from INFORMATION_SCHEMA.INNODB_CHANGED_PAGES that don't require
+# a running log tracker
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+
+# Test for bug 1342494: InnoDB: Failing assertion: bitmap_files->files[i].start_lsn
+# >= bitmap_files->files[i - 1].start_lsn on inconsistent bitmap file directory 
+
+--echo creating inconsistent bitmap dir: start LSN of 3rd file < start LSN of 2nd file
+write_file $MYSQLD_DATADIR/ib_modified_log_1_0.xdb;
+EOF
+write_file $MYSQLD_DATADIR/ib_modified_log_2_10.xdb;
+EOF
+write_file $MYSQLD_DATADIR/ib_modified_log_3_5.xdb;
+EOF
+
+call mtr.add_suppression("inconsistent bitmap file directory");
+
+--error ER_CANT_FIND_SYSTEM_REC
+SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;
+
+remove_files_wildcard $MYSQLD_DATADIR ib_modified_log*;
 
=== modified file 'storage/innobase/log/log0online.cc'
--- storage/innobase/log/log0online.cc	2014-07-16 09:05:45 +0000
+++ storage/innobase/log/log0online.cc	2014-07-18 13:51:04 +0000
@@ -1264,6 +1264,7 @@
 /*********************************************************************//**
 Diagnose a bitmap file range setup failure and free the partially-initialized
 bitmap file range.  */
+UNIV_COLD
 static
 void
 log_online_diagnose_inconsistent_dir(
@@ -1445,26 +1446,30 @@
 		return FALSE;
 	}
 
-#ifdef UNIV_DEBUG
-	if (!bitmap_files->files[0].seq_num) {
+	if (!bitmap_files->files[0].seq_num
+	    || bitmap_files->files[0].seq_num != first_file_seq_num) {
 
 		log_online_diagnose_inconsistent_dir(bitmap_files);
 		return FALSE;
 	}
-	ut_ad(bitmap_files->files[0].seq_num == first_file_seq_num);
+
 	{
 		size_t i;
 		for (i = 1; i < bitmap_files->count; i++) {
 			if (!bitmap_files->files[i].seq_num) {
 				break;
 			}
-			ut_ad(bitmap_files->files[i].seq_num
-			      > bitmap_files->files[i - 1].seq_num);
-			ut_ad(bitmap_files->files[i].start_lsn
-			      >= bitmap_files->files[i - 1].start_lsn);
+			if ((bitmap_files->files[i].seq_num
+			      <= bitmap_files->files[i - 1].seq_num)
+			    || (bitmap_files->files[i].start_lsn
+				< bitmap_files->files[i - 1].start_lsn)) {
+
+				log_online_diagnose_inconsistent_dir(
+								bitmap_files);
+				return FALSE;
+			}
 		}
 	}
-#endif
 
 	return TRUE;
 }