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

[Hrvoje Matijakovic]

=== 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 @@
 
    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.
 
+.. option:: --galera-info
+
+   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.
+
 .. option:: --slave-info
 
    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.
 
=== modified file 'innobackupex'
--- innobackupex	2012-06-18 12:32:21 +0000
+++ innobackupex	2012-08-02 12:41:20 +0000
@@ -2619,7 +2619,7 @@
              [--include=REGEXP] [--user=NAME]
              [--password=WORD] [--port=PORT] [--socket=SOCKET]
              [--no-timestamp] [--ibbackup=IBBACKUP-BINARY]
-             [--slave-info] [--stream=tar|xbstream]
+             [--slave-info] [--galera-info] [--stream=tar|xbstream]
              [--scpopt=OPTIONS-FOR-SCP]  [--sshopt=OPTIONS-FOR-SSH]
              [--defaults-file=MY.CNF] [--defaults-group=GROUP-NAME]
              [--databases=LIST] [--remote-host=HOSTNAME] [--no-lock] 
@@ -2707,6 +2707,10 @@
 
 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.
 
+=item --galera-info
+
+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.
+
 =item --help
 
 This option displays a help screen and exits.