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

[Hrvoje Matijakovic]

[Alexey Kopytov (akopytov)]

Hrvoje,

- along with removign docs for --force-tar, it would make sense to also remove the option itself from innobackupex.

- "The |xtrabackup| binary will _be_ located..."

review: Needs Fixing

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'doc/source/howtos/recipes_ibkx_inc.rst'
--- doc/source/howtos/recipes_ibkx_inc.rst	2012-02-02 20:21:43 +0000
+++ doc/source/howtos/recipes_ibkx_inc.rst	2012-05-15 09:39:51 +0000
@@ -30,7 +30,7 @@
 
 Now apply the incremental backup to the base backup, by issuing: ::
 
-  innobackupex --apply-log $FULLBACKUP
+  innobackupex --apply-log --redo-only $FULLBACKUP
    --incremental-dir=$INCREMENTALBACKUP
    --use-memory=1G --user=DVADER --password=D4RKS1D3
 

=== modified file 'doc/source/innobackupex/innobackupex_option_reference.rst'
--- doc/source/innobackupex/innobackupex_option_reference.rst	2012-04-21 07:12:28 +0000
+++ doc/source/innobackupex/innobackupex_option_reference.rst	2012-05-15 09:39:51 +0000
@@ -127,10 +127,6 @@
 
    This option accepts a string argument that specifies the location where a temporary file will be stored. It should be used when :option:`--remote-host` or :option:`--stream` is specified. For these options, the transaction log will first be stored to a temporary file, before streaming or copying to a remote host. This option specifies the location where that temporary file will be stored. If the option is not specifed, the default is to use the value of ``tmpdir`` read from the server configuration.
 
-.. option:: --force-tar
-
-   This option forces the use of :command:`tar` when creating a streamed backup, rather than :program:`tar4ibd`, which is the default.
-
 .. option:: --scpopt = '-Cp -c arcfour'
 
    This option accepts a string argument that specifies the command line options to pass to :command:`scp` when the option :option:`--remost-host` is specified. If the option is not specified, the default options are ``-Cp -c arcfour``.

=== modified file 'doc/source/installation/compiling_xtrabackup.rst'
--- doc/source/installation/compiling_xtrabackup.rst	2011-07-12 04:19:38 +0000
+++ doc/source/installation/compiling_xtrabackup.rst	2012-05-15 09:39:51 +0000
@@ -54,14 +54,5 @@
 
   $ AUTO_DOWNLOAD="yes" ./utils/build.sh xtradb
 
-and you go for a coffee, at your return |XtraBackup| will be ready to be used. The |xtrabackup| binary will located in the following subdirectory depending on the building target:
+and you go for a coffee, at your return |XtraBackup| will be ready to be used. The |xtrabackup| binary will be located in the ``percona-xtrabackup/src`` subdirectory.
 
-  ================== =====================================================
-  Target             Location
-  ================== =====================================================
-  innodb51_builtin   mysql-5.1/storage/innobase/xtrabackup
-  innodb51           mysql-5.1/storage/innodb_plugin/xtrabackup
-  innodb55           mysql-5.5/storage/innobase/xtrabackup
-  xtradb51           Percona-Server-5.1/storage/innodb_plugin/xtrabackup
-  xtradb55           Percona-Server-5.5/storage/innobase/xtrabackup
-  ================== =====================================================

=== modified file 'innobackupex'
--- innobackupex	2012-04-30 04:27:01 +0000
+++ innobackupex	2012-05-15 09:39:51 +0000
@@ -103,7 +103,6 @@
 my $option_tmpdir = '';
 
 my $option_tar4ibd = '';
-my $option_force_tar = '';
 my $option_scp_opt = '-Cp -c arcfour';
 my $option_ssh_opt = '';
 
@@ -1757,7 +1756,6 @@
                         'ibbackup=s' => \$option_ibbackup_binary,
                         'scpopt=s' => \$option_scp_opt,
                         'sshopt=s' => \$option_ssh_opt,
-                        'force-tar', => \$option_force_tar,
                         'parallel=i' => \$option_parallel,
                         'safe-slave-backup' => \$option_safe_slave_backup,
                         'safe-slave-backup-timeout' => $option_safe_slave_backup_timeout,
@@ -2628,7 +2626,7 @@
              [--include=REGEXP] [--user=NAME]
              [--password=WORD] [--port=PORT] [--socket=SOCKET]
              [--no-timestamp] [--ibbackup=IBBACKUP-BINARY]
-             [--slave-info] [--stream=tar|xbstream] [--force-tar]
+             [--slave-info] [--stream=tar|xbstream]
              [--scpopt=OPTIONS-FOR-SCP]  [--sshopt=OPTIONS-FOR-SSH]
              [--defaults-file=MY.CNF]
              [--databases=LIST] [--remote-host=HOSTNAME] [--no-lock] 
@@ -2716,10 +2714,6 @@
 
 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 --force-tar
-
-This option forces the use of tar when creating a streamed backup, rather than tar4ibd, which is the default.
-
 =item --help
 
 This option displays a help screen and exits.