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

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-1.6-param/129/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2012-04-17 12:44:49 +0000
+++ innobackupex	2012-05-22 16:52:20 +0000
@@ -564,7 +564,7 @@
 		"file $copy_dir_dst/$_ exists";
 	}
 
-	print STDERR "$prefix Copying file '$copy_dir_dst/$_'\n";
+	print STDERR "$prefix Copying '$File::Find::name' to '$dst_path'\n";
 	copy($File::Find::name, $dst_path) or Die "copy failed: $!";
     }
 }
@@ -584,8 +584,9 @@
 #     use rsync when --rsync is specified
 #
 sub copy_dir_recursively {
-    $copy_dir_src = shift;
-    $copy_dir_dst = shift;
+    # Clean paths and remove trailing slashes if any
+    $copy_dir_src = File::Spec->canonpath(shift);
+    $copy_dir_dst = File::Spec->canonpath(shift);
     $copy_dir_exclude_regexp = shift;
     $copy_dir_overwrite = shift;
 
 
=== added file 'test/t/bug1002688.sh'
--- test/t/bug1002688.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug1002688.sh	2012-05-22 16:52:20 +0000
@@ -0,0 +1,68 @@
+############################################################################
+# Bug #1002688: innobackupex incremental apply-log copies to wrong directory
+############################################################################
+. inc/common.sh
+
+init
+run_mysqld --innodb_file_per_table
+load_sakila
+
+# Full backup
+# backup root directory
+vlog "Starting backup"
+
+full_backup_dir=$topdir/full_backup
+innobackupex  --no-timestamp $full_backup_dir
+
+# Changing data
+
+run_cmd $MYSQL $MYSQL_ARGS -e "CREATE DATABASE newdb"
+run_cmd $MYSQL $MYSQL_ARGS -e \
+    "CREATE TABLE actor_copy ENGINE=MyISAM SELECT * FROM sakila.actor" newdb
+
+# Saving the checksum of original table
+checksum_a=`checksum_table newdb actor_copy`
+test -n "$checksum_a" || die "Failed to checksum table actor_copy"
+
+vlog "Making incremental backup"
+
+# Incremental backup
+inc_backup_dir=$topdir/incremental_backup
+innobackupex --incremental --no-timestamp \
+    --incremental-basedir=$full_backup_dir $inc_backup_dir
+vlog "Incremental backup created in directory $inc_backup_dir"
+
+vlog "Preparing backup"
+innobackupex --apply-log --redo-only $full_backup_dir
+vlog "Log applied to full backup"
+
+innobackupex --apply-log --redo-only --incremental-dir=$inc_backup_dir/ \
+    $full_backup_dir
+vlog "Delta applied to full backup"
+
+innobackupex --apply-log $full_backup_dir
+vlog "Data prepared for restore"
+
+# Destroying mysql data
+stop_mysqld
+rm -rf $mysql_datadir/*
+vlog "Data destroyed"
+
+# Restore backup
+vlog "Copying files to their original locations"
+innobackupex --copy-back $full_backup_dir
+vlog "Data restored"
+
+run_mysqld --innodb_file_per_table
+
+vlog "Checking checksums"
+checksum_b=`checksum_table newdb actor_copy`
+
+vlog "Old checksum: $checksum_a"
+vlog "New checksum: $checksum_b"
+
+if [ "$checksum_a" != "$checksum_b"  ]
+then 
+    vlog "Checksums do not match"
+    exit -1
+fi