Merge lp:~hrvojem/percona-xtrabackup/bug1032090-2.0 into lp:percona-xtrabackup/2.0

Proposed by Hrvoje Matijakovic on 2012-08-02
Status: Merged
Approved by: Stewart Smith on 2012-08-15
Approved revision: 451
Merged at revision: 463
Proposed branch: lp:~hrvojem/percona-xtrabackup/bug1032090-2.0
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 38 lines (+9/-1)
2 files modified
doc/source/innobackupex/innobackupex_option_reference.rst (+4/-0)
innobackupex (+5/-1)
To merge this branch: bzr merge lp:~hrvojem/percona-xtrabackup/bug1032090-2.0
Reviewer Review Type Date Requested Status
Percona core 2012-08-02 Pending
Review via email: mp+117882@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/source/innobackupex/innobackupex_option_reference.rst'
2--- doc/source/innobackupex/innobackupex_option_reference.rst 2012-06-04 10:29:26 +0000
3+++ doc/source/innobackupex/innobackupex_option_reference.rst 2012-08-02 12:41:20 +0000
4@@ -86,6 +86,10 @@
5
6 This option prevents creation of a time-stamped subdirectory of the ``BACKUP-ROOT-DIR`` given on the command line. When it is specified, the backup is done in ``BACKUP-ROOT-DIR`` instead.
7
8+.. option:: --galera-info
9+
10+ This options creates the ``xtrabackup_galera_info`` file which contains the local node state at the time of the backup. Option should be used when performing the backup of Percona-XtraDB-Cluster.
11+
12 .. option:: --slave-info
13
14 This option is useful when backing up a replication slave server. It prints the binary log position and name of the master server. It also writes this information to the :file:`xtrabackup_slave_info` file as a ``CHANGE MASTER`` command. A new slave for this master can be set up by starting a slave server on this backup and issuing a ``CHANGE MASTER`` command with the binary log position saved in the :file:`xtrabackup_slave_info` file.
15
16=== modified file 'innobackupex'
17--- innobackupex 2012-06-18 12:32:21 +0000
18+++ innobackupex 2012-08-02 12:41:20 +0000
19@@ -2619,7 +2619,7 @@
20 [--include=REGEXP] [--user=NAME]
21 [--password=WORD] [--port=PORT] [--socket=SOCKET]
22 [--no-timestamp] [--ibbackup=IBBACKUP-BINARY]
23- [--slave-info] [--stream=tar|xbstream]
24+ [--slave-info] [--galera-info] [--stream=tar|xbstream]
25 [--scpopt=OPTIONS-FOR-SCP] [--sshopt=OPTIONS-FOR-SSH]
26 [--defaults-file=MY.CNF] [--defaults-group=GROUP-NAME]
27 [--databases=LIST] [--remote-host=HOSTNAME] [--no-lock]
28@@ -2707,6 +2707,10 @@
29
30 This option specifies the directory in which to save an extra copy of the "xtrabackup_checkpoints" file. The option accepts a string argument. It is passed directly to xtrabackup's --extra-lsndir option. See the xtrabackup documentation for details.
31
32+=item --galera-info
33+
34+This options creates the xtrabackup_galera_info file which contians the local node state at the time of the backup. Option should be used when performing the backup of Percona-XtraDB-Cluster.
35+
36 =item --help
37
38 This option displays a help screen and exits.

Subscribers

People subscribed via source and target branches