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
=== modified file 'doc/source/innobackupex/innobackupex_option_reference.rst'
--- doc/source/innobackupex/innobackupex_option_reference.rst 2012-06-04 10:29:26 +0000
+++ doc/source/innobackupex/innobackupex_option_reference.rst 2012-08-02 12:41:20 +0000
@@ -86,6 +86,10 @@
8686
87 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.87 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.
8888
89.. option:: --galera-info
90
91 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.
92
89.. option:: --slave-info93.. option:: --slave-info
9094
91 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.95 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.
9296
=== modified file 'innobackupex'
--- innobackupex 2012-06-18 12:32:21 +0000
+++ innobackupex 2012-08-02 12:41:20 +0000
@@ -2619,7 +2619,7 @@
2619 [--include=REGEXP] [--user=NAME]2619 [--include=REGEXP] [--user=NAME]
2620 [--password=WORD] [--port=PORT] [--socket=SOCKET]2620 [--password=WORD] [--port=PORT] [--socket=SOCKET]
2621 [--no-timestamp] [--ibbackup=IBBACKUP-BINARY]2621 [--no-timestamp] [--ibbackup=IBBACKUP-BINARY]
2622 [--slave-info] [--stream=tar|xbstream]2622 [--slave-info] [--galera-info] [--stream=tar|xbstream]
2623 [--scpopt=OPTIONS-FOR-SCP] [--sshopt=OPTIONS-FOR-SSH]2623 [--scpopt=OPTIONS-FOR-SCP] [--sshopt=OPTIONS-FOR-SSH]
2624 [--defaults-file=MY.CNF] [--defaults-group=GROUP-NAME]2624 [--defaults-file=MY.CNF] [--defaults-group=GROUP-NAME]
2625 [--databases=LIST] [--remote-host=HOSTNAME] [--no-lock] 2625 [--databases=LIST] [--remote-host=HOSTNAME] [--no-lock]
@@ -2707,6 +2707,10 @@
27072707
2708This 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.2708This 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.
27092709
2710=item --galera-info
2711
2712This 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.
2713
2710=item --help2714=item --help
27112715
2712This option displays a help screen and exits.2716This option displays a help screen and exits.

Subscribers

People subscribed via source and target branches