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

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

  1. bug1320685-2.2
  2. Merge into 2.2
Proposed by Alexey Kopytov
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 4981
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1320685-2.2
Merge into: lp:percona-xtrabackup/2.2
Prerequisite: lp:~akopytov/percona-xtrabackup/bug1320441-2.2
Diff against target: 66 lines (+23/-3)
2 files modified
storage/innobase/xtrabackup/innobackupex.pl (+21/-1)
storage/innobase/xtrabackup/test/t/backup_locks.sh (+2/-2)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1320685-2.2
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+222233@code.launchpad.net

Description of the change

Manual merge from 2.1.

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 'storage/innobase/xtrabackup/innobackupex.pl'
2--- storage/innobase/xtrabackup/innobackupex.pl 2014-06-05 16:46:34 +0000
3+++ storage/innobase/xtrabackup/innobackupex.pl 2014-06-05 16:46:34 +0000
4@@ -77,6 +77,7 @@
5 my $have_changed_page_bitmaps = 0;
6 my $have_backup_locks = 0;
7 my $have_galera_enabled = 0;
8+my $have_flush_engine_logs = 0;
9
10 # command line options
11 my $option_help = '';
12@@ -2001,6 +2002,12 @@
13
14 write_binlog_info(\%mysql);
15
16+ if ($have_flush_engine_logs) {
17+ my $now = current_time();
18+ print STDERR "$now $prefix Executing FLUSH ENGINE LOGS...\n";
19+ mysql_query(\%mysql, "FLUSH ENGINE LOGS");
20+ }
21+
22 # resume XtraBackup and wait till it has finished
23 resume_ibbackup($suspend_file);
24 $suspend_file = $work_dir . $xb_fn_log_copied;
25@@ -4844,7 +4851,20 @@
26 "line, but the server does not support Galera replication. " .
27 "Ignoring the option.";
28
29- $option_galera_info = 0;
30+ $option_galera_info = 0;
31+ }
32+
33+ if ($mysql{vars}->{version}->{Value} =~ m/5.[123]\.\d/) {
34+ my $now = current_time();
35+
36+ print STDERR "\n$now $prefix Warning: FLUSH ENGINE LOGS " .
37+ "is not supported " .
38+ "by the server. Data may be inconsistent with " .
39+ "binary log coordinates!\n";
40+
41+ $have_flush_engine_logs = 0;
42+ } else {
43+ $have_flush_engine_logs = 1;
44 }
45 }
46
47
48=== modified file 'storage/innobase/xtrabackup/test/t/backup_locks.sh'
49--- storage/innobase/xtrabackup/test/t/backup_locks.sh 2014-03-24 17:48:44 +0000
50+++ storage/innobase/xtrabackup/test/t/backup_locks.sh 2014-06-05 16:46:34 +0000
51@@ -32,7 +32,7 @@
52 Com_show_slave_status_nolock 0
53 Com_unlock_binlog 1
54 Com_unlock_tables 1
55-Com_flush 0
56+Com_flush 1
57 EOF
58
59 innobackupex --no-timestamp --incremental \
60@@ -51,5 +51,5 @@
61 Com_show_slave_status_nolock 0
62 Com_unlock_binlog 2
63 Com_unlock_tables 2
64-Com_flush 0
65+Com_flush 2
66 EOF

Subscribers

People subscribed via source and target branches

to all changes: