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

[Laurynas Biveinis]

No BT or ST, 5.6 QA blocker.

2nd MP:

http://jenkins.percona.com/job/percona-server-5.1-param/577/

Changes from the 1st MP:
- Addressed schema_store_table_record() comment.
- Merged bug 1204075 change from XtraBackup.

1st MP:

http://jenkins.percona.com/job/percona-server-5.1-param/574/

Fix
- 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).

The issue is bug 1191580 is a race condition between the two bitmap
file enumeration passes in log_online_setup_bitmap_file_range(). If
the 1st bitmap file in the range is deleted at that point, then the
debug build will crash as reported on this bug. For release builds
this is not an issue as the missing bitmap file will be detected and
diagnosed on an attempt to open it, as fixed by bug 1179974. The
current bug shows that the fix for the latter was incomplete.

Fixed by adjusting the range check code in
log_online_setup_bitmap_file_range() to check for the above condition,
print diagnostics, and return range setup error. Since these
diagnostics are now printed in two places instead of one, pull it out
to a new static function log_online_diagnose_inconsistent_dir().
Adjust it to print "Warning" instead of "Error" as it's not a fatal
issue.

At the same time fix bug 1191589. The issue there is that on
log_online_bitmap_iterator_init() failure (such as bug 1191580), the
error is not returned to client properly. Fixed by returning
ER_CANT_FIND_SYSTEM_REC. At the same time replace
schema_table_store_record() return value check with an OK() assert to
avoid having to return some error in the case of its failure as well.

Add a testcase, common for both bugs, to
percona_changed_page_bmp_debug.test.

[Vlad Lesin (vlad-lesin)]

This change

@@ -4029,11 +4030,7 @@
                if (cond && !cond->val_int())
                        continue;

- if (schema_table_store_record(thd, table))
- {
- log_online_bitmap_iterator_release(&i);
- DBUG_RETURN(1);
- }
+ OK(schema_table_store_record(thd, table));

                ++output_rows_num;
        }

should be reverted because if schema_table_store_record() fails (for example there is no free space for MyISAM temp table) there will be memory leak as heap memory allocation was done during initialization of "i" iterator.

review: Needs Fixing (g2)

[Vlad Lesin (vlad-lesin)]

review: Approve (g2)

=== modified file 'Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp_debug.result'
--- Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp_debug.result	2013-09-09 13:09:38 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/r/percona_changed_page_bmp_debug.result	2013-09-25 07:59:41 +0000
@@ -33,5 +33,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_plugin/t/percona_changed_page_bmp_debug.test'
--- Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_debug.test	2013-09-09 13:09:38 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_changed_page_bmp_debug.test	2013-09-25 07:59:41 +0000
@@ -93,6 +93,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/innodb_plugin/handler/i_s.cc'
--- Percona-Server/storage/innodb_plugin/handler/i_s.cc	2013-08-05 13:11:52 +0000
+++ Percona-Server/storage/innodb_plugin/handler/i_s.cc	2013-09-25 07:59:41 +0000
@@ -3969,6 +3969,7 @@
 	}
 
 	if (!log_online_bitmap_iterator_init(&i, min_lsn, max_lsn)) {
+		my_error(ER_CANT_FIND_SYSTEM_REC, MYF(0));
 		DBUG_RETURN(1);
 	}
 
@@ -4032,6 +4033,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/innodb_plugin/log/log0online.c'
--- Percona-Server/storage/innodb_plugin/log/log0online.c	2013-05-31 09:06:13 +0000
+++ Percona-Server/storage/innodb_plugin/log/log0online.c	2013-09-25 07:59:41 +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) };
 
 /** Log parsing and bitmap output data structure */
@@ -1248,6 +1256,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 */
+{
+	fprintf(stderr,
+		"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
@@ -1348,6 +1374,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);
@@ -1383,12 +1411,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;
 		}
 
@@ -1415,8 +1438,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++) {