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

Merge lp:~sergei.glushchenko/percona-xtrabackup/bug910206_InnoDB_version-1.6 into lp:percona-xtrabackup/1.6

  1. bug910206_InnoDB_version-1.6
  2. Merge into release-1.6
Proposed by Sergei Glushchenko
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 318
Proposed branch: lp:~sergei.glushchenko/percona-xtrabackup/bug910206_InnoDB_version-1.6
Merge into: lp:percona-xtrabackup/1.6
Diff against target: 34 lines (+4/-4)
2 files modified
innobackupex (+2/-2)
test/bootstrap.sh (+2/-2)
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-xtrabackup/bug910206_InnoDB_version-1.6
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+89524@code.launchpad.net

Description of the change

- added optional "rel" to pattern for innodb_version matching
- changed m// to m/.*/ which is more deterministic

To post a comment you must log in.
Revision history for this message
Sergei Glushchenko (sergei.glushchenko) wrote :

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

Revision history for this message
Alexey Kopytov (akopytov) wrote :

Shouldn't we also upgrade the Percona Server version in bootstrap.sh to 5.1.60, so we test the fix in Jenkins?

review: Needs Fixing
Revision history for this message
Sergei Glushchenko (sergei.glushchenko) wrote :

> Shouldn't we also upgrade the Percona Server version in bootstrap.sh to 5.1.60, so we test the fix in Jenkins?

Yep. You're surely right.

here is the new jenkins build:
http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-1.6-param/97/

Jenkins is much less responsive today. I hope it will warm up soon.

Revision history for this message
Alexey Kopytov (akopytov) wrote :

OK to merge, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'innobackupex'
2--- innobackupex 2012-01-09 05:26:49 +0000
3+++ innobackupex 2012-01-23 16:51:03 +0000
4@@ -2410,13 +2410,13 @@
5 if($var_version =~ m/5\.0\.\d/){
6 $ibbackup_binary = ($win eq 1 ? 'xtrabackup.exe' : 'xtrabackup_51');
7 }
8-if($var_version =~ m/5\.1\.\d/ and $var_innodb_version =~ m//){
9+if($var_version =~ m/5\.1\.\d/ and $var_innodb_version =~ m/.*/){
10 $ibbackup_binary = ($win eq 1 ? 'xtrabackup.exe' : 'xtrabackup_51');
11 }
12 if($var_version =~ m/5\.1\.\d/ and $var_innodb_version =~ m/1\.0\.\d+$/){
13 $ibbackup_binary = ($win eq 1 ? 'xtrabackup.exe' : 'xtrabackup');
14 }
15-if($var_version =~ m/5\.1\.\d/ and $var_innodb_version =~ m/1\.0\.\d+-\d/){
16+if($var_version =~ m/5\.1\.\d/ and $var_innodb_version =~ m/1\.0\.\d+-(rel)?\d/){
17 $ibbackup_binary = ($win eq 1 ? 'xtrabackup.exe' : 'xtrabackup');
18 }
19 if($var_version =~ m/5\.5\.\d/){
20
21=== modified file 'test/bootstrap.sh'
22--- test/bootstrap.sh 2011-09-20 20:18:53 +0000
23+++ test/bootstrap.sh 2012-01-23 16:51:03 +0000
24@@ -42,8 +42,8 @@
25 tarball="mysql-5.5.16-linux2.6-$arch.tar.gz"
26 ;;
27 xtradb51)
28- url="http://s3.amazonaws.com/percona.com/downloads/Percona-Server-5.1/Percona-Server-5.1.57-12.8/Linux/binary"
29- tarball="Percona-Server-5.1.57-rel12.8-233-Linux-$arch.tar.gz"
30+ url="http://www.percona.com/redir/downloads/Percona-Server-5.1/Percona-Server-5.1.60-13.1/binary/linux/$arch"
31+ tarball="Percona-Server-5.1.60-rel13.1-413.Linux.$arch.tar.gz"
32 ;;
33 xtradb55)
34 url="http://s3.amazonaws.com/percona.com/downloads/Percona-Server-5.5/Percona-Server-5.5.11-20.2/Linux/binary"

Subscribers

People subscribed via source and target branches