Merge lp:~sergei.glushchenko/percona-xtrabackup/xb21-bug1038127 into lp:percona-xtrabackup/2.1

[Sergei Glushchenko]

Merge fix for bug 1038127 from 2.0

[Sergei Glushchenko (sergei.glushchenko)]

please hold until jenkins build passed

[Sergei Glushchenko (sergei.glushchenko)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/40/
can be considered OK

[Laurynas Biveinis (laurynas-biveinis)]

The commit is missing the --fixes=lp:123 option.
s/compatable/compatible for the testcase header - applies for 2.0 fix too, not sure if we want to fix this now.

No need for another Jenkins run for these changes.

review: Needs Fixing

[Alexey Kopytov (akopytov)]

The --fixes-lp:123 is not required as long as the branch is associated with the bug. It's OK to do it manually.

[Sergei Glushchenko (sergei.glushchenko)]

Typo in comment been fixed

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'src/xtrabackup.c'
--- src/xtrabackup.c	2012-08-03 05:14:45 +0000
+++ src/xtrabackup.c	2012-09-05 08:37:22 +0000
@@ -1499,10 +1499,14 @@
 static my_bool
 xb_read_delta_metadata(const char *filepath, xb_delta_info_t *info)
 {
-	FILE *fp;
-	my_bool r= TRUE;
+	FILE*	fp;
+	char	key[51];
+	char	value[51];
+	my_bool	r			= TRUE;
 
-	memset(info, 0, sizeof(xb_delta_info_t));
+	/* set defaults */
+	info->page_size = ULINT_UNDEFINED;
+	info->space_id = ULINT_UNDEFINED;
 
 	fp = fopen(filepath, "r");
 	if (!fp) {
@@ -1510,12 +1514,28 @@
 		return(TRUE);
 	}
 
-	if (fscanf(fp, "page_size = %lu\nspace_id = %lu\n",
-		&info->page_size, &info->space_id) != 2)
-		r= FALSE;
+	while (!feof(fp)) {
+		if (fscanf(fp, "%50s = %50s\n", key, value) == 2) {
+			if (strcmp(key, "page_size") == 0) {
+				info->page_size = strtoul(value, NULL, 10);
+			} else if (strcmp(key, "space_id") == 0) {
+				info->space_id = strtoul(value, NULL, 10);
+			}
+		}
+	}
 
 	fclose(fp);
 
+	if (info->page_size == ULINT_UNDEFINED) {
+		msg("xtrabackup: page_size is required in %s\n", filepath);
+		r = FALSE;
+	}
+	if (info->space_id == ULINT_UNDEFINED) {
+		msg("xtrabackup: Warning: This backup was taken with XtraBackup 2.0.1 "
+			"or earlier, some DDL operations between full and incremental "
+			"backups may be handled incorrectly\n");
+	}
+
 	return(r);
 }
 
@@ -3836,7 +3856,7 @@
 	os_file_t	file	= 0;
 	ulint		tablespace_flags;
 
-	ut_a(dbname || space_id == 0);
+	ut_a(dbname != NULL || space_id == 0 || space_id == ULINT_UNDEFINED);
 
 	*success = FALSE;
 
@@ -3870,7 +3890,7 @@
 	mutex_exit(&fil_system->mutex);
 
 	if (fil_space != NULL) {
-		if (fil_space->id == space_id) {
+		if (fil_space->id == space_id || space_id == ULINT_UNDEFINED) {
 			/* we found matching space */
 			goto found;
 		} else {
@@ -3894,6 +3914,7 @@
 	}
 
 	mutex_enter(&fil_system->mutex);
+	ut_a(space_id != ULINT_UNDEFINED);
 	fil_space = xb_space_get_by_id(space_id);
 	mutex_exit(&fil_system->mutex);
 	if (fil_space != NULL) {
 
=== added file 'test/t/bug1038127.sh'
--- test/t/bug1038127.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug1038127.sh	2012-09-05 08:37:22 +0000
@@ -0,0 +1,41 @@
+############################################################################
+# Bug #1038127: XtraBackup 2.0.2 is not backwards compatible
+#               if no space_id found in .meta file, applying delta
+#               to full backup failing
+############################################################################
+
+. inc/common.sh
+
+start_server --innodb_file_per_table
+
+run_cmd $MYSQL $MYSQL_ARGS test <<EOF
+CREATE TABLE t1(a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1), (2), (3);
+EOF
+
+# Full backup
+# backup root directory
+vlog "Starting backup"
+innobackupex  --no-timestamp $topdir/full
+
+vlog "Creating incremental backup"
+
+innobackupex --incremental --no-timestamp \
+    --incremental-basedir=$topdir/full $topdir/inc
+
+# remove space_id = something line from .meta file
+sed -ie '/space_id/ d' $topdir/inc/test/t1.ibd.meta
+
+vlog "Preparing backup"
+
+innobackupex --apply-log --redo-only $topdir/full
+vlog "Log applied to full backup"
+
+innobackupex --apply-log --redo-only --incremental-dir=$topdir/inc \
+    $topdir/full
+vlog "Delta applied to full backup"
+
+innobackupex --apply-log $topdir/full
+vlog "Data prepared for restore"
+
+grep -q "This backup was taken with XtraBackup 2.0.1" $OUTFILE