Merge lp:~laurynas-biveinis/percona-xtrabackup/bug1204075 into lp:percona-xtrabackup/2.1

[Laurynas Biveinis]

http://jenkins.percona.com/job/percona-xtrabackup-2.1-param/405/

    Fix bug 1204075 (xb_incremental_bitmap_misc.sh fails in debug xtradb56
    builds | missing bitmap data at the interval start fails "
    bitmap_files->files[0].start_lsn == first_file_start_lsn" assertion).

    The issue is that debug code at the end of
    log_online_setup_bitmap_file_range() attempts too strict a consistency
    check which will fail if the bitmap data is missing at the required
    interval start. Such situation will result in first_file_start_lsn
    keeping its sentinel value, which will differ from the
    bitmap_files->files[0].start_lsn containing the actual lowest start
    LSN of the found bitmap files.

    The missing bitmap data at the interval start is properly diagnosed
    elsewhere in xb_page_bitmap_init(), thus the assert is redundant and
    the fix is to remove it.

    At the same time bring over other changes from Percona Server version
    of log_online_setup_bitmap_file_range(): initialize
    first_file_start_lsn to LSN_MAX instead of 0, and diagnose bitmap file
    directory sanity by returning an error instead of a release build
    assert.

    For LSN_MAX, add a compatibility define in innodb_int.h for 5.1-5.5
    versions.

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'src/changed_page_bitmap.cc'
--- src/changed_page_bitmap.cc	2013-04-16 10:35:58 +0000
+++ src/changed_page_bitmap.cc	2013-07-29 13:52:40 +0000
@@ -270,7 +270,7 @@
 	os_file_stat_t	bitmap_dir_file_info;
 	ulong		first_file_seq_num	= ULONG_MAX;
 	ulong		last_file_seq_num	= 0;
-	lsn_t		first_file_start_lsn	= 0;
+	lsn_t		first_file_start_lsn	= LSN_MAX;
 
 	xb_ad(range_end >= range_start);
 
@@ -378,7 +378,14 @@
 		}
 
 		array_pos = file_seq_num - first_file_seq_num;
-		xb_a(array_pos < bitmap_files->count);
+		if (UNIV_UNLIKELY(array_pos >= bitmap_files->count)) {
+
+			msg("InnoDB: Error: inconsistent bitmap file "
+			    "directory\n");
+			free(bitmap_files->files);
+			return FALSE;
+		}
+
 		if (file_seq_num > bitmap_files->files[array_pos].seq_num) {
 
 			bitmap_files->files[array_pos].seq_num = file_seq_num;
@@ -401,7 +408,6 @@
 
 #ifdef UNIV_DEBUG
 	ut_ad(bitmap_files->files[0].seq_num == first_file_seq_num);
-	ut_ad(bitmap_files->files[0].start_lsn == first_file_start_lsn);
 
 	for (size_t i = 1; i < bitmap_files->count; i++) {
 		if (!bitmap_files->files[i].seq_num) {

=== modified file 'src/innodb_int.h'
--- src/innodb_int.h	2013-07-20 14:24:26 +0000
+++ src/innodb_int.h	2013-07-29 13:52:40 +0000
@@ -163,6 +163,7 @@
 #  define XB_DICT_SUFFIX_LEN 0
 #  define INT64PF	"%lld"
 #  define UINT64PF "%llu"
+#  define LSN_MAX IB_ULONGLONG_MAX
 #  define LSN_PF UINT64PF
 #  define DEFAULT_LOG_FILE_SIZE 5*1024*1024
    typedef ulint		dberr_t;