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

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

  1. bug910206_InnoDB_version
  2. Merge into 2.0
Proposed by Sergei Glushchenko
Status: Superseded
Proposed branch: lp:~sergei.glushchenko/percona-xtrabackup/bug910206_InnoDB_version
Merge into: lp:percona-xtrabackup/2.0
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
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Needs Fixing
Review via email: mp+89523@code.launchpad.net

This proposal has been superseded by a proposal from 2012-01-24.

Description of the change

- added optional "rel" to pattern for innodb_version matching
- change 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-param/109/

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

Please don't duplicate changes when doing the same fix in multiple branches. Instead, just fix the bug in the lowest version branch (1.6 in this case), and then upmerge that revision to trunk. So that we don't have revisions in 1.6 that have not been merged to 2.0.

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
lp:~sergei.glushchenko/percona-xtrabackup/bug910206_InnoDB_version updated
380. By Sergei Glushchenko

merge from 1.6 bugfix

Unmerged revisions

380. By Sergei Glushchenko

merge from 1.6 bugfix

379. By Hrvoje Matijakovic

Added additional note mentioned in the comments regarding bug #914422

378. By Hrvoje Matijakovic

Fixed more typos

377. By Hrvoje Matijakovic

fixed more typos

376. By Hrvoje Matijakovic

added note regarding the proper permissions

375. By Hrvoje Matijakovic

Fixed errors alexey found

374. By Hrvoje Matijakovic

Fixed formatting for bug #878457

373. By Hrvoje Matijakovic

Fixed bug #878457

372. By Hrvoje Matijakovic

Fixed Bug #914422

371. By Hrvoje Matijakovic

build errors fixes

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:27:16 +0000
3+++ innobackupex 2012-01-23 17:10:28 +0000
4@@ -2481,13 +2481,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 2012-01-08 23:34:45 +0000
23+++ test/bootstrap.sh 2012-01-23 17:10:28 +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