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

Merge lp:~percona-core/percona-xtrabackup/release-2.1.3 into lp:percona-xtrabackup/2.1

  1. release-2.1.3
  2. Merge into 2.1
Proposed by Ignacio Nin
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 609
Proposed branch: lp:~percona-core/percona-xtrabackup/release-2.1.3
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 46 lines (+7/-5)
3 files modified
VERSION (+1/-1)
innobackupex (+5/-3)
src/Makefile (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-xtrabackup/release-2.1.3
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+165488@code.launchpad.net

Description of the change

Changes for release 2.1.3

To post a comment you must log in.
Revision history for this message
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 'VERSION'
2--- VERSION 2013-05-17 15:59:05 +0000
3+++ VERSION 2013-05-23 21:11:28 +0000
4@@ -1,1 +1,1 @@
5-XTRABACKUP_VERSION=2.1.2
6+XTRABACKUP_VERSION=2.1.3
7
8=== modified file 'innobackupex'
9--- innobackupex 2013-05-17 13:19:18 +0000
10+++ innobackupex 2013-05-23 21:11:28 +0000
11@@ -285,7 +285,7 @@
12 }
13 } elsif ($option_backup) {
14 # backup
15- %mysql = mysql_connect(abort_on_error => 1, keepalives => 1);
16+ %mysql = mysql_connect(abort_on_error => 1);
17
18 if ($option_ibbackup_binary eq 'autodetect') {
19 $option_ibbackup_binary = set_xtrabackup_version();
20@@ -1404,9 +1404,11 @@
21 }
22 }
23
24- if ($con{dbh} && $con{keepalives}) {
25+ if ($con{dbh}) {
26 $con{dbh}->do("SET SESSION wait_timeout=2147483");
27- start_keepalives(\%con);
28+ if ($con{keepalives}) {
29+ start_keepalives(\%con);
30+ }
31 }
32
33 return %con;
34
35=== modified file 'src/Makefile'
36--- src/Makefile 2013-04-16 10:35:58 +0000
37+++ src/Makefile 2013-05-23 21:11:28 +0000
38@@ -243,7 +243,7 @@
39 common.h changed_page_bitmap.h read_filt.h innodb_int.h
40
41 $(TARGET): $(XTRABACKUPCCOBJS) $(XTRABACKUPCOBJS) $(INNODBOBJS) $(MYSQLOBJS) $(LIBARCHIVE_A)
42- $(CXX) $(CFXXLAGS) $(XTRABACKUPCCOBJS) $(XTRABACKUPCOBJS) $(INNODBOBJS) $(MYSQLOBJS) $(LIBS) \
43+ $(CXX) $(CXXFLAGS) $(XTRABACKUPCCOBJS) $(XTRABACKUPCOBJS) $(INNODBOBJS) $(MYSQLOBJS) $(LIBS) \
44 $(LIBARCHIVE_A) -o $(TARGET)
45
46 clean:

Subscribers

People subscribed via source and target branches

to all changes: