Merge lp:~sergei.glushchenko/percona-xtrabackup/2.1-xb-bug1363234 into lp:percona-xtrabackup/2.1

[Sergei Glushchenko]

http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.1-param-new/21/

Don't remove undo tablespaces during incremental prepare.

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'innobackupex.pl'
--- innobackupex.pl	2014-11-21 08:35:11 +0000
+++ innobackupex.pl	2014-12-08 09:22:46 +0000
@@ -2605,7 +2605,7 @@
             push(@skip_list, "\Q$c->{filename}\E");
         }
         cleanup_dir_recursively($backup_dir,
-                             '^(' . join('|', @skip_list, '.*\.ibd') . ')$');
+                '^(' . join('|', @skip_list, '.*\.ibd', 'undo[0-9]+') . ')$');
     }
 
 }
 
=== added file 'test/t/bug1363234.sh'
--- test/t/bug1363234.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug1363234.sh	2014-12-08 09:22:46 +0000
@@ -0,0 +1,29 @@
+########################################################################
+# Bug 1363234: Incremental backup fail with innodb_undo_tablespaces > 1
+########################################################################
+
+. inc/common.sh
+
+require_server_version_higher_than 5.6.0
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb_file_per_table=1
+innodb_undo_tablespaces=4
+"
+
+start_server
+load_sakila
+
+# backup
+innobackupex --no-timestamp $topdir/backup
+innobackupex --incremental --no-timestamp \
+    --incremental-basedir=$topdir/backup $topdir/inc1
+innobackupex --incremental --no-timestamp \
+    --incremental-basedir=$topdir/inc1 $topdir/inc2
+
+# prepare (last one would fail)
+innobackupex --apply-log --redo-only $topdir/backup
+innobackupex --apply-log --redo-only --incremental-dir=$topdir/inc1 \
+    $topdir/backup
+innobackupex --apply-log --redo-only --incremental-dir=$topdir/inc2 \
+    $topdir/backup