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

[Laurynas Biveinis]

Merge fix for bug 1044398 from 2.0.

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

[lp:~laurynas-biveinis/percona-xtrabackup/bug1044398-2.1]

430. By Alexey Kopytov on 2012-09-07

Automerge from 2.0.

[Alexey Kopytov (akopytov)]

Same comments as for the 2.0 version.

review: Needs Fixing

[lp:~laurynas-biveinis/percona-xtrabackup/bug1044398-2.1]

431. By Stewart Smith on 2012-09-10

merge fix for Bug #1038127: XtraBackup 2.0.2 is not backwards compatible

432. By Stewart Smith on 2012-09-10

null merge 2.0

433. By Laurynas Biveinis on 2012-09-11

Merge fix for bug 1044398 from 2.0.

Unmerged revisions

433. By Laurynas Biveinis on 2012-09-11

Merge fix for bug 1044398 from 2.0.

=== modified file 'src/write_filt.c'
--- src/write_filt.c	2012-08-01 10:10:44 +0000
+++ src/write_filt.c	2012-09-11 11:02:20 +0000
@@ -118,6 +118,7 @@
 	snprintf(meta_name, sizeof(meta_name), "%s%s", dst_name,
 		 XB_DELTA_INFO_SUFFIX);
 	info.page_size = cursor->page_size;
+	info.zip_size = cursor->zip_size;
 	info.space_id = cursor->space_id;
 	if (!xb_write_delta_metadata(meta_name, &info)) {
 		msg("[%02lu] xtrabackup: Error: "
 
=== modified file 'src/xtrabackup.c'
--- src/xtrabackup.c	2012-09-05 08:35:45 +0000
+++ src/xtrabackup.c	2012-09-11 11:02:20 +0000
@@ -1506,6 +1506,7 @@
 
 	/* set defaults */
 	info->page_size = ULINT_UNDEFINED;
+	info->zip_size = ULINT_UNDEFINED;
 	info->space_id = ULINT_UNDEFINED;
 
 	fp = fopen(filepath, "r");
@@ -1518,6 +1519,8 @@
 		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, "zip_size") == 0) {
+				info->zip_size = strtoul(value, NULL, 10);
 			} else if (strcmp(key, "space_id") == 0) {
 				info->space_id = strtoul(value, NULL, 10);
 			}
@@ -1530,6 +1533,10 @@
 		msg("xtrabackup: page_size is required in %s\n", filepath);
 		r = FALSE;
 	}
+	if (info->zip_size == ULINT_UNDEFINED) {
+		msg("xtrabackup: zip_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 "
@@ -1552,8 +1559,10 @@
 	MY_STAT		mystat;
 
 	snprintf(buf, sizeof(buf),
-		 "page_size = %lu\nspace_id = %lu\n",
-		 info->page_size, info->space_id);
+		 "page_size = %lu\n"
+		 "zip_size = %lu\n"
+		 "space_id = %lu\n",
+		 info->page_size, info->zip_size, info->space_id);
 	len = strlen(buf);
 
 	mystat.st_size = len;
@@ -4088,8 +4097,7 @@
 	xb_file_set_nocache(src_file, src_path, "OPEN");
 
 	dst_file = xb_delta_open_matching_space(
-			dbname, space_name, info.space_id,
-			info.page_size == UNIV_PAGE_SIZE ? 0 : info.page_size,
+			dbname, space_name, info.space_id, info.zip_size,
 			dst_path, sizeof(dst_path), &success);
 	if (!success) {
 		msg("xtrabackup: error: cannot open %s\n", dst_path);
 
=== modified file 'src/xtrabackup.h'
--- src/xtrabackup.h	2012-07-11 07:55:58 +0000
+++ src/xtrabackup.h	2012-09-11 11:02:20 +0000
@@ -22,8 +22,9 @@
 #define XB_XTRABACKUP_H
 
 typedef struct {
-    ulint	page_size;
- 	ulint	space_id;
+	ulint	page_size;
+	ulint	zip_size;
+	ulint	space_id;
 } xb_delta_info_t;
 
 typedef enum {
 
=== added file 'test/t/bug1044398.sh'
--- test/t/bug1044398.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug1044398.sh	2012-09-11 11:02:20 +0000
@@ -0,0 +1,37 @@
+# Test compatibility for pre-bug 1044398 incremental meta files.
+
+. inc/common.sh
+
+if [ -z "$INNODB_VERSION" ]; then
+    echo "Requires InnoDB plugin or XtraDB" >$SKIPPED_REASON
+    exit $SKIPPED_EXIT_CODE
+fi
+
+start_server --innodb_file_per_table
+
+vlog "Creating full backup"
+innobackupex --no-timestamp $topdir/full
+
+vlog "Creating new tablespace"
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e \
+    "CREATE TABLE t1(a INT) ENGINE=InnoDB" test
+    
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e \
+    "INSERT INTO t1 VALUES (1)" test
+
+vlog "Creating incremental backup"
+innobackupex --incremental --no-timestamp \
+    --incremental-basedir=$topdir/full $topdir/inc
+
+# Remove zip_size = $page_size line from .meta file
+sed -ie '/zip_size/ d' $topdir/inc/test/t1.ibd.meta
+
+vlog "Preparing backup, applying log"
+innobackupex --apply-log -redo-only $topdir/full
+
+vlog "Preparing backup, applying delta, should fail with missing zip_size error"
+run_cmd_expect_failure $IB_BIN $IB_ARGS --apply-log --redo-only --incremental-dir=$topdir/inc $topdir/full
+
+grep -q "xtrabackup: zip_size is required " $OUTFILE
+
+stop_server