Merge lp:~akopytov/percona-xtrabackup/bug809073-1.7 into lp:percona-xtrabackup/2.0

[Alexey Kopytov]

[Stewart Smith (stewart)]

review: Approve

=== modified file 'doc/source/innobackupex/how_innobackupex_works.rst'
--- doc/source/innobackupex/how_innobackupex_works.rst	2011-07-28 05:29:04 +0000
+++ doc/source/innobackupex/how_innobackupex_works.rst	2011-10-21 17:52:17 +0000
@@ -17,7 +17,7 @@
 
 By default, it starts :program:`xtrabackup` with the :option:`--suspend-at-end` option, and lets it copy the InnoDB data files. When :program:`xtrabackup` finishes that, :program:`innobackupex` sees it create the :file:`xtrabackup_suspended` file and executes ``FLUSH TABLES WITH READ LOCK``. Then it begins copying the rest of the files.
 
-If the :option:`--ibbackup-binary` is not supplied, |innobackupex| will try to detect it: if the :file:`xtrabackup_binary` file exists on the backup directory, it reads from it which binary of |xtrabackup| will be used. Otherwise, it will try to connect to the database server in order to determine it. If the connection can't be established, |xtrabackup| will fail and you must specify it (see :ref:`ibk-right-binary`).
+If the :option:`--ibbackup` is not supplied, |innobackupex| will try to detect it: if the :file:`xtrabackup_binary` file exists on the backup directory, it reads from it which binary of |xtrabackup| will be used. Otherwise, it will try to connect to the database server in order to determine it. If the connection can't be established, |xtrabackup| will fail and you must specify it (see :ref:`ibk-right-binary`).
 
 When the binary is determined, the connection to the database server is checked. This done by connecting, issuing a query, and closing the connection. If everything goes well, the binary is started as a child process.
 

=== modified file 'doc/source/innobackupex/innobackupex_option_reference.rst'
--- doc/source/innobackupex/innobackupex_option_reference.rst	2011-07-07 05:32:50 +0000
+++ doc/source/innobackupex/innobackupex_option_reference.rst	2011-10-21 17:52:17 +0000
@@ -90,7 +90,7 @@
 
    Use this option to disable table lock with ``FLUSH TABLES WITH READ LOCK``. Use it only if ALL your tables are InnoDB and you **DO NOT CARE** about the binary log position of the backup.
 
-.. option:: --ibbackup-binary = 'autodetect'
+.. option:: --ibbackup = 'autodetect'
 
    This option accepts a string argument that specifies which xtrabackup binary should be used. The string should be the command used to run *XtraBackup*. The option can be useful if the :program:`xtrabackup` binary is not in your search path or working directory and the database server is not accessible at the moment. If this option is not specified, :program:`innobackupex` attempts to determine the binary to use automatically. By default, :program:`xtrabackup` is the command used. When option :option:`--apply-log` is specified, the binary is used whose name is in the file :file:`xtrabackup_binary` in the backup directory, if that file exists, or will attempt to autodetect it. However, if :option:`--copy-back` is selected, :program:`xtrabackup` is used unless other is specified.
 

=== modified file 'innobackupex'
--- innobackupex	2011-10-21 13:53:48 +0000
+++ innobackupex	2011-10-21 17:52:17 +0000
@@ -2376,7 +2376,7 @@
 
 innobackupex [--compress[=LEVEL]] [--include=REGEXP] [--user=NAME] 
              [--password=WORD] [--port=PORT] [--socket=SOCKET]
-             [--no-timestamp] [--ibbackup-binary=IBBACKUP-BINARY]
+             [--no-timestamp] [--ibbackup=IBBACKUP-BINARY]
              [--slave-info] [--stream=tar] [--force-tar]
              [--scpopt=OPTIONS-FOR-SCP] [--defaults-file=MY.CNF]
              [--databases=LIST] [--remote-host=HOSTNAME] [--no-lock] 
@@ -2464,7 +2464,7 @@
 
 This option specifies the host to use when connecting to the database server with TCP/IP.  The option accepts a string argument. It is passed to the mysql child process without alteration. See mysql --help for details.
 
-=item --ibbackup-binary=IBBACKUP-BINARY
+=item --ibbackup=IBBACKUP-BINARY
 
 This option specifies which xtrabackup binary should be used.  The option accepts a string argument. IBBACKUP-BINARY should be the command used to run XtraBackup. The option can be useful if the xtrabackup binary is not in your search path or working directory. If this option is not specified, innobackupex attempts to determine the binary to use automatically. By default, "xtrabackup" is the command used. However, when option --copy-back is specified, "xtrabackup_51" is the command used. And when option --apply-log is specified, the binary is used whose name is in the file "xtrabackup_binary" in the backup directory, if that file exists.