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

[Laurynas Biveinis]

No BT or ST but 5.6 QA blocker.

2nd MP:

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

1st MP:

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

Merge bug 1191580 and bug 1191589 fixes from 5.5.

[Vlad Lesin (vlad-lesin)]

See this note: https://code.launchpad.net/~laurynas-biveinis/percona-server/bug1191580-1191589-5.1/+merge/186707/comments/426447 .

review: Needs Fixing (g2)

[Vlad Lesin (vlad-lesin)]

review: Approve

=== modified file 'Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_debug.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_debug.result	2013-09-09 14:20:25 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_debug.result	2013-09-25 08:03:15 +0000
@@ -35,5 +35,11 @@
 SET @@GLOBAL.innodb_track_changed_pages=TRUE;
 SET @@GLOBAL.innodb_track_redo_log_now=TRUE;
 SET DEBUG_SYNC="now SIGNAL finish_alter_table";
+SET DEBUG_SYNC="setup_bitmap_range_middle SIGNAL changed_pages_query_ready WAIT_FOR finish_changed_pages_query";
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;
+SET DEBUG_SYNC="now WAIT_FOR changed_pages_query_ready";
+call mtr.add_suppression("InnoDB: Warning: inconsistent bitmap file directory");
+SET DEBUG_SYNC="now SIGNAL finish_changed_pages_query";
+ERROR HY000: Can't read record in system table
 SET DEBUG_SYNC="RESET";
 DROP TABLE t2;

=== modified file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_debug.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_debug.test	2013-09-24 13:11:08 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_debug.test	2013-09-25 08:03:15 +0000
@@ -95,6 +95,37 @@
 
 --connection default
 reap;
+
+#
+# Test for
+# - bug 1191580 (InnoDB: Failing assertion: bitmap_files->files[0].seq_num
+#   == first_file_seq_num in file log0online.cc line 1423 | abort in
+#   log_online_setup_bitmap_file_range)
+# - bug 1191589 (mysqld-debug: .../sql/protocol.cc:518: void
+#   Protocol::end_statement(): Assertion `0' failed on a
+#   INFORMATION_SCHEMA.INNODB_CHANGED_PAGES query)
+#
+
+SET DEBUG_SYNC="setup_bitmap_range_middle SIGNAL changed_pages_query_ready WAIT_FOR finish_changed_pages_query";
+
+send SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES;
+
+--connection con2
+
+SET DEBUG_SYNC="now WAIT_FOR changed_pages_query_ready";
+
+# Remove the first bitmap file in the range after it has been enumerated 
+remove_files_wildcard $MYSQLD_DATADIR ib_modified_log_1_*.xdb;
+
+call mtr.add_suppression("InnoDB: Warning: inconsistent bitmap file directory");
+
+SET DEBUG_SYNC="now SIGNAL finish_changed_pages_query";
+
+--connection default
+
+--error ER_CANT_FIND_SYSTEM_REC
+reap;
+
 SET DEBUG_SYNC="RESET";
 
 disconnect con2;

=== modified file 'Percona-Server/storage/innobase/handler/i_s.cc'
--- Percona-Server/storage/innobase/handler/i_s.cc	2013-09-20 05:27:28 +0000
+++ Percona-Server/storage/innobase/handler/i_s.cc	2013-09-25 08:03:15 +0000
@@ -8229,6 +8229,7 @@
 	}
 
 	if (!log_online_bitmap_iterator_init(&i, min_lsn, max_lsn)) {
+		my_error(ER_CANT_FIND_SYSTEM_REC, MYF(0));
 		DBUG_RETURN(1);
 	}
 
@@ -8292,6 +8293,7 @@
 		if (schema_table_store_record(thd, table))
 		{
 			log_online_bitmap_iterator_release(&i);
+			my_error(ER_CANT_FIND_SYSTEM_REC, MYF(0));
 			DBUG_RETURN(1);
 		}
 

=== modified file 'Percona-Server/storage/innobase/log/log0online.cc'
--- Percona-Server/storage/innobase/log/log0online.cc	2013-06-25 13:13:06 +0000
+++ Percona-Server/storage/innobase/log/log0online.cc	2013-09-25 08:03:15 +0000
@@ -34,6 +34,14 @@
 #include "trx0sys.h"
 #include "ut0rbt.h"
 
+#ifdef __WIN__
+/* error LNK2001: unresolved external symbol _debug_sync_C_callback_ptr */
+# define DEBUG_SYNC_C(dummy) ((void) 0)
+#else
+# include "m_string.h" /* for my_sys.h */
+# include "my_sys.h" /* DEBUG_SYNC_C */
+#endif
+
 enum { FOLLOW_SCAN_SIZE = 4 * (UNIV_PAGE_SIZE_MAX) };
 
 #ifdef UNIV_PFS_MUTEX
@@ -1251,6 +1259,24 @@
 }
 
 /*********************************************************************//**
+Diagnose a bitmap file range setup failure and free the partially-initialized
+bitmap file range.  */
+static
+void
+log_online_diagnose_inconsistent_dir(
+/*=================================*/
+	log_online_bitmap_file_range_t	*bitmap_files)	/*!<in/out: bitmap file
+							range */
+{
+	ib_logf(IB_LOG_LEVEL_WARN,
+		"InnoDB: Warning: inconsistent bitmap file "
+		"directory for a "
+		"INFORMATION_SCHEMA.INNODB_CHANGED_PAGES query"
+		"\n");
+	free(bitmap_files->files);
+}
+
+/*********************************************************************//**
 List the bitmap files in srv_data_home and setup their range that contains the
 specified LSN interval.  This range, if non-empty, will start with a file that
 has the greatest LSN equal to or less than the start LSN and will include all
@@ -1351,6 +1377,8 @@
 
 	bitmap_files->count = last_file_seq_num - first_file_seq_num + 1;
 
+	DEBUG_SYNC_C("setup_bitmap_range_middle");
+
 	/* 2nd pass: get the file names in the file_seq_num order */
 
 	bitmap_dir = os_file_opendir(srv_data_home, FALSE);
@@ -1388,12 +1416,7 @@
 		array_pos = file_seq_num - first_file_seq_num;
 		if (UNIV_UNLIKELY(array_pos >= bitmap_files->count)) {
 
-			fprintf(stderr,
-				"InnoDB: Error: inconsistent bitmap file "
-				"directory for a "
-				"INFORMATION_SCHEMA.INNODB_CHANGED_PAGES query"
-				"\n");
-			free(bitmap_files->files);
+			log_online_diagnose_inconsistent_dir(bitmap_files);
 			return FALSE;
 		}
 
@@ -1420,8 +1443,12 @@
 	}
 
 #ifdef UNIV_DEBUG
+	if (!bitmap_files->files[0].seq_num) {
+
+		log_online_diagnose_inconsistent_dir(bitmap_files);
+		return FALSE;
+	}
 	ut_ad(bitmap_files->files[0].seq_num == first_file_seq_num);
-	ut_ad(bitmap_files->files[0].start_lsn == first_file_start_lsn);
 	{
 		size_t i;
 		for (i = 1; i < bitmap_files->count; i++) {