Merge lp:~akopytov/percona-xtrabackup/bug826632-1.6 into lp:percona-xtrabackup/1.6

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-1.6-param/89/

[Stewart Smith (stewart)]

review: Approve

=== modified file 'test/inc/sakila-db/sakila-data.sql'
--- test/inc/sakila-db/sakila-data.sql	2010-06-02 13:05:00 +0000
+++ test/inc/sakila-db/sakila-data.sql	2011-12-28 14:00:30 +0000
@@ -67,13 +67,6 @@
 COMMIT;
 
 --
--- Trigger to enforce create dates on INSERT
---
-
-CREATE TRIGGER customer_create_date BEFORE INSERT ON customer
-	FOR EACH ROW SET NEW.create_date = NOW();
-
---
 -- Dumping data for table film
 --
 
@@ -123,13 +116,6 @@
 COMMIT;
 
 --
--- Trigger to enforce payment_date during INSERT
---
-
-CREATE TRIGGER payment_date BEFORE INSERT ON payment
-	FOR EACH ROW SET NEW.payment_date = NOW();
-
---
 -- Dumping data for table rental
 --
 
@@ -139,13 +125,6 @@
 COMMIT;
 
 --
--- Trigger to enforce rental_date on INSERT
---
-
-CREATE TRIGGER rental_date BEFORE INSERT ON rental
-	FOR EACH ROW SET NEW.rental_date = NOW();
-
---
 -- Dumping data for table staff
 --
 
@@ -163,4 +142,4 @@
 
 SET SQL_MODE=@OLD_SQL_MODE;
 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
-SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
 \ No newline at end of file
+SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
 
=== modified file 'test/inc/sakila-db/sakila-schema.sql'
--- test/inc/sakila-db/sakila-schema.sql	2010-06-02 13:05:00 +0000
+++ test/inc/sakila-db/sakila-schema.sql	2011-12-28 14:00:30 +0000
@@ -636,6 +636,28 @@
 
 DELIMITER ;
 
+--
+-- Trigger to enforce payment_date during INSERT
+--
+
+CREATE TRIGGER payment_date BEFORE INSERT ON payment
+	FOR EACH ROW SET NEW.payment_date = NOW();
+
+--
+-- Trigger to enforce create dates on INSERT
+--
+
+CREATE TRIGGER customer_create_date BEFORE INSERT ON customer
+	FOR EACH ROW SET NEW.create_date = NOW();
+
+--
+-- Trigger to enforce rental_date on INSERT
+--
+
+CREATE TRIGGER rental_date BEFORE INSERT ON rental
+	FOR EACH ROW SET NEW.rental_date = NOW();
+
+
 SET SQL_MODE=@OLD_SQL_MODE;
 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
 
=== modified file 'test/t/xb_parallel.sh'
--- test/t/xb_parallel.sh	2011-12-07 13:28:47 +0000
+++ test/t/xb_parallel.sh	2011-12-28 14:00:30 +0000
@@ -1,7 +1,7 @@
 . inc/common.sh
 
 init
-run_mysqld 
+run_mysqld --innodb_file_per_table
 load_dbase_schema sakila
 load_dbase_data sakila
 
 
=== added file 'test/t/xb_parallel_incremental.sh'
--- test/t/xb_parallel_incremental.sh	1970-01-01 00:00:00 +0000
+++ test/t/xb_parallel_incremental.sh	2011-12-28 14:00:30 +0000
@@ -0,0 +1,58 @@
+##########################################################################
+# Bug #826632: parallel option breaks incremental backups                #
+##########################################################################
+
+. inc/common.sh
+
+init
+run_mysqld --innodb_file_per_table
+load_dbase_schema sakila
+load_dbase_data sakila
+
+# Take backup
+vlog "Creating the backup directory: $topdir/backup"
+backup_dir="$topdir/backup"
+innobackupex $topdir/full_backup --no-timestamp --parallel=8
+
+# Make some changes for incremental backup by truncating and reloading
+# tables. TRUNCATE cannot be used here, because that would be executed
+# as DROP + CREATE internally for InnoDB tables, so tablespace IDs
+# would change.
+
+table_list=`$MYSQL $MYSQL_ARGS -Ns -e \
+"SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='sakila' \
+AND TABLE_TYPE='BASE TABLE'"`
+
+for t in $table_list
+do
+    run_cmd $MYSQL $MYSQL_ARGS -s sakila <<EOF
+SET foreign_key_checks=0;
+DELETE FROM $t;
+SET foreign_key_checks=1;
+EOF
+done
+
+load_dbase_data sakila
+
+# Do an incremental parallel backup
+innobackupex --incremental --no-timestamp --parallel=8 \
+    --incremental-basedir=$topdir/full_backup $topdir/inc_backup
+
+stop_mysqld
+# Remove datadir
+rm -r $mysql_datadir
+
+vlog "Applying log"
+innobackupex --apply-log --redo-only $topdir/full_backup
+innobackupex --apply-log --redo-only --incremental-dir=$topdir/inc_backup \
+    $topdir/full_backup
+innobackupex --apply-log $topdir/full_backup
+
+vlog "Restoring MySQL datadir"
+mkdir -p $mysql_datadir
+innobackupex --copy-back $topdir/full_backup
+
+run_mysqld
+
+# Check sakila
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "SELECT count(*) from actor" sakila
 
=== modified file 'xtrabackup.c'
--- xtrabackup.c	2011-12-05 12:35:43 +0000
+++ xtrabackup.c	2011-12-28 14:00:30 +0000
@@ -610,8 +610,6 @@
 LSN64 incremental_lsn;
 LSN64 incremental_to_lsn;
 LSN64 incremental_last_lsn;
-byte* incremental_buffer = NULL;
-byte* incremental_buffer_base = NULL;
 
 char *xtrabackup_incremental_basedir = NULL; /* for --backup */
 char *xtrabackup_extra_lsndir = NULL; /* for --backup with --extra-lsndir */
@@ -2591,6 +2589,8 @@
 	IB_INT64	offset;
 	ulint		page_in_buffer;
 	ulint		incremental_buffers = 0;
+	byte*		incremental_buffer;
+	byte*		incremental_buffer_base = NULL;
 	ulint		page_size;
 	ulint		page_size_shift;
 #ifdef INNODB_VERSION_SHORT
@@ -2740,6 +2740,12 @@
 	}
 
 	if (xtrabackup_incremental) {
+		/* allocate buffer for incremental backup (4096 pages) */
+		incremental_buffer_base = ut_malloc((UNIV_PAGE_SIZE_MAX / 4 + 1)
+						    * UNIV_PAGE_SIZE_MAX);
+		incremental_buffer = ut_align(incremental_buffer_base,
+				      UNIV_PAGE_SIZE_MAX);
+
 		snprintf(meta_path, sizeof(meta_path),
 			 "%s%s", dst_path, XB_DELTA_INFO_SUFFIX);
 		strcat(dst_path, ".delta");
@@ -3003,6 +3009,8 @@
 		os_file_close(src_file);
 	}
 	os_file_close(dst_file);
+	if (incremental_buffer_base)
+		ut_free(incremental_buffer_base);
 	ut_free(buf2);
 	return(FALSE);
 error:
@@ -3010,6 +3018,8 @@
 		os_file_close(src_file);
 	if (dst_file != -1)
 		os_file_close(dst_file);
+	if (incremental_buffer_base)
+		ut_free(incremental_buffer_base);
 	if (buf2)
 		ut_free(buf2);
 	fprintf(stderr, "[%02u] xtrabackup: Error: "
@@ -3021,6 +3031,8 @@
 		os_file_close(src_file);
 	if (dst_file != -1)
 		os_file_close(dst_file);
+	if (incremental_buffer_base)
+		ut_free(incremental_buffer_base);
 	if (buf2)
 		ut_free(buf2);
 	fprintf(stderr, "[%02u] xtrabackup: Warning: skipping file %s.\n",
@@ -5087,6 +5099,8 @@
 	xb_delta_info_t info;
 	ulint		page_size;
 	ulint		page_size_shift;
+	byte*		incremental_buffer_base = NULL;
+	byte*		incremental_buffer;
 
 	ut_a(xtrabackup_incremental);
 
@@ -5200,6 +5214,12 @@
 		os_file_set_nocache(dst_file, dst_path, "OPEN");
 	}
 
+	/* allocate buffer for incremental backup (4096 pages) */
+	incremental_buffer_base = ut_malloc((UNIV_PAGE_SIZE_MAX / 4 + 1) *
+					 UNIV_PAGE_SIZE_MAX);
+	incremental_buffer = ut_align(incremental_buffer_base,
+				      UNIV_PAGE_SIZE_MAX);
+
 	fprintf(stderr, "Applying %s ...\n", src_path);
 
 	while (!last_buffer) {
@@ -5282,6 +5302,8 @@
 		incremental_buffers++;
 	}
 
+	if (incremental_buffer_base)
+		ut_free(incremental_buffer_base);
 	if (src_file != -1)
 		os_file_close(src_file);
 	if (dst_file != -1)
@@ -5289,6 +5311,8 @@
 	return TRUE;
 
 error:
+	if (incremental_buffer_base)
+		ut_free(incremental_buffer_base);
 	if (src_file != -1)
 		os_file_close(src_file);
 	if (dst_file != -1)
@@ -6184,12 +6208,6 @@
 				xtrabackup_incremental);
 			exit(EXIT_FAILURE);
 		}
-
-		/* allocate buffer for incremental backup (4096 pages) */
-		incremental_buffer_base = malloc((UNIV_PAGE_SIZE_MAX / 4 + 1) *
-						 UNIV_PAGE_SIZE_MAX);
-		incremental_buffer = ut_align(incremental_buffer_base,
-					      UNIV_PAGE_SIZE_MAX);
 	} else if (xtrabackup_backup && xtrabackup_incremental_basedir) {
 		char	filename[FN_REFLEN];
 
@@ -6204,12 +6222,6 @@
 
 		incremental_lsn = metadata_to_lsn;
 		xtrabackup_incremental = xtrabackup_incremental_basedir; //dummy
-
-		/* allocate buffer for incremental backup (4096 pages) */
-		incremental_buffer_base = malloc((UNIV_PAGE_SIZE_MAX / 4 + 1) *
-						 UNIV_PAGE_SIZE_MAX);
-		incremental_buffer = ut_align(incremental_buffer_base,
-					      UNIV_PAGE_SIZE_MAX);
 	} else if (xtrabackup_prepare && xtrabackup_incremental_dir) {
 		char	filename[FN_REFLEN];
 
@@ -6227,17 +6239,7 @@
 		incremental_last_lsn = metadata_last_lsn;
 		xtrabackup_incremental = xtrabackup_incremental_dir; //dummy
 
-		/* allocate buffer for incremental backup (4096 pages) */
-		incremental_buffer_base = malloc((UNIV_PAGE_SIZE / 4 + 1) *
-						 UNIV_PAGE_SIZE);
-		incremental_buffer = ut_align(incremental_buffer_base,
-					      UNIV_PAGE_SIZE);
 	} else {
-		/* allocate buffer for applying incremental (for header page only) */
-		incremental_buffer_base = malloc((1 + 1) * UNIV_PAGE_SIZE_MAX);
-		incremental_buffer = ut_align(incremental_buffer_base,
-					      UNIV_PAGE_SIZE_MAX);
-
 		xtrabackup_incremental = NULL;
 	}
 
@@ -6324,8 +6326,6 @@
 	if (xtrabackup_prepare)
 		xtrabackup_prepare_func();
 
-	free(incremental_buffer_base);
-
 	if (xtrabackup_tables) {
 		/* free regexp */
 		int i;