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

Proposed by Sergei Glushchenko on 2014-12-08
Status: Merged
Approved by: Alexey Kopytov on 2014-12-10
Approved revision: 769
Merged at revision: 769
Proposed branch: lp:~sergei.glushchenko/percona-xtrabackup/2.1-xb-bug1363234
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 46 lines (+30/-1)
2 files modified
innobackupex.pl (+1/-1)
test/t/bug1363234.sh (+29/-0)
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-xtrabackup/2.1-xb-bug1363234
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2014-12-08 Approve on 2014-12-10
Review via email: mp+243955@code.launchpad.net

Description of the change

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

Don't remove undo tablespaces during incremental prepare.

To post a comment you must log in.
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'innobackupex.pl'
2--- innobackupex.pl 2014-11-21 08:35:11 +0000
3+++ innobackupex.pl 2014-12-08 09:22:46 +0000
4@@ -2605,7 +2605,7 @@
5 push(@skip_list, "\Q$c->{filename}\E");
6 }
7 cleanup_dir_recursively($backup_dir,
8- '^(' . join('|', @skip_list, '.*\.ibd') . ')$');
9+ '^(' . join('|', @skip_list, '.*\.ibd', 'undo[0-9]+') . ')$');
10 }
11
12 }
13
14=== added file 'test/t/bug1363234.sh'
15--- test/t/bug1363234.sh 1970-01-01 00:00:00 +0000
16+++ test/t/bug1363234.sh 2014-12-08 09:22:46 +0000
17@@ -0,0 +1,29 @@
18+########################################################################
19+# Bug 1363234: Incremental backup fail with innodb_undo_tablespaces > 1
20+########################################################################
21+
22+. inc/common.sh
23+
24+require_server_version_higher_than 5.6.0
25+
26+MYSQLD_EXTRA_MY_CNF_OPTS="
27+innodb_file_per_table=1
28+innodb_undo_tablespaces=4
29+"
30+
31+start_server
32+load_sakila
33+
34+# backup
35+innobackupex --no-timestamp $topdir/backup
36+innobackupex --incremental --no-timestamp \
37+ --incremental-basedir=$topdir/backup $topdir/inc1
38+innobackupex --incremental --no-timestamp \
39+ --incremental-basedir=$topdir/inc1 $topdir/inc2
40+
41+# prepare (last one would fail)
42+innobackupex --apply-log --redo-only $topdir/backup
43+innobackupex --apply-log --redo-only --incremental-dir=$topdir/inc1 \
44+ $topdir/backup
45+innobackupex --apply-log --redo-only --incremental-dir=$topdir/inc2 \
46+ $topdir/backup

Subscribers

People subscribed via source and target branches