Percona XtraBackup moved to https://jira.percona.com/projects/PXB

Merge lp:~akopytov/percona-xtrabackup/bug1255019-2.2 into lp:percona-xtrabackup/2.2

  1. bug1255019-2.2
  2. Merge into 2.2
Proposed by Alexey Kopytov
Status: Merged
Approved by: George Ormond Lorch III
Approved revision: no longer in the source branch.
Merged at revision: 4918
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1255019-2.2
Merge into: lp:percona-xtrabackup/2.2
Diff against target: 36 lines (+8/-4)
1 file modified
storage/innobase/xtrabackup/test/t/xb_apply_archived_logs.sh (+8/-4)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1255019-2.2
Reviewer Review Type Date Requested Status
George Ormond Lorch III (community) g2 Approve
Review via email: mp+200097@code.launchpad.net
To post a comment you must log in.
Revision history for this message
George Ormond Lorch III (gl-az) :
review: Approve (g2)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'storage/innobase/xtrabackup/test/t/xb_apply_archived_logs.sh'
2--- storage/innobase/xtrabackup/test/t/xb_apply_archived_logs.sh 2013-11-26 10:44:44 +0000
3+++ storage/innobase/xtrabackup/test/t/xb_apply_archived_logs.sh 2013-12-27 10:35:03 +0000
4@@ -18,9 +18,9 @@
5 while [ $max_lsn -le $stop_lsn ];
6 do
7 $command
8- for i in `ls -1 $arch_log_dir`;
9+ for i in $arch_log_dir/*;
10 do
11- local lsn=`echo $i | sed -s 's/ib_log_archive_\([0-9]\+\)/\1/'`
12+ local lsn=${i#$arch_log_dir/ib_log_archive_}
13 if [ $lsn -gt $max_lsn ];
14 then
15 max_lsn=$lsn
16@@ -326,9 +326,10 @@
17 #set.
18 pushd .
19 cd $ARCHIVED_LOGS_DIR
20- for i in `find . -type f -printf "%T+ %p\n" | cut -d' ' -f2`;
21+ for i in *;
22 do
23- local n=`echo $i | sed 's/.*ib_log_archive_\([0-9]*\).*/\1/'`;
24+ test -f $i || continue
25+ local n=${i#ib_log_archive_}
26 if [ $n -le $LSN ];
27 then
28 mv $i 1/;
29@@ -376,4 +377,7 @@
30 require_xtradb
31 require_server_version_higher_than '5.6.10'
32
33+test_archived_logs
34+test_archived_logs '' 'ROW_FORMAT=COMPRESSED'
35+
36 exit $RESULT

Subscribers

People subscribed via source and target branches

to all changes: