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

Merge lp:~akopytov/percona-xtrabackup/bug1227988-2.1 into lp:percona-xtrabackup/2.1

  1. bug1227988-2.1
  2. Merge into 2.1
Proposed by Alexey Kopytov
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 680
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1227988-2.1
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 49 lines (+5/-5)
3 files modified
innobackupex (+1/-1)
test/run.sh (+3/-0)
test/t/version_check.sh (+1/-4)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1227988-2.1
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+186964@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/452/

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

Self-approving, trivial change.

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 2013-09-16 17:21:44 +0000
3+++ innobackupex 2013-09-23 06:27:09 +0000
4@@ -142,7 +142,7 @@
5
6 my $option_debug_sleep_before_unlock = '';
7
8-my $option_version_check = '';
9+my $option_version_check = '1';
10
11 my %mysql;
12 my $option_backup = '';
13
14=== modified file 'test/run.sh'
15--- test/run.sh 2013-08-21 06:57:40 +0000
16+++ test/run.sh 2013-09-23 06:27:09 +0000
17@@ -299,6 +299,9 @@
18
19 export TAR MYSQL_BASEDIR MYSQL MYSQLD MYSQLADMIN \
20 MYSQL_INSTALL_DB PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH MYSQLDUMP
21+
22+ # Use stage-v.percona.com as a VersionCheck server
23+ export PERCONA_VERSION_CHECK_URL=https://stage-v.percona.com
24 }
25
26
27
28=== modified file 'test/t/version_check.sh'
29--- test/t/version_check.sh 2013-08-26 10:17:00 +0000
30+++ test/t/version_check.sh 2013-09-23 06:27:09 +0000
31@@ -7,9 +7,6 @@
32
33 start_server
34
35-# Use stage-v.percona.com is VC server
36-export PERCONA_VERSION_CHECK_URL=https://stage-v.percona.com
37-
38 # VersionCheck looks for a directory where percona-version-check file is created
39 # in the following order:
40 #
41@@ -27,7 +24,7 @@
42
43 rm -f /tmp/percona-version-check
44
45-innobackupex --version-check --no-timestamp $topdir/backup
46+innobackupex --no-timestamp $topdir/backup
47
48 if [ ! -f /tmp/percona-version-check ]
49 then

Subscribers

People subscribed via source and target branches

to all changes: