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

[Hrvoje Matijakovic]

[Alexey Kopytov (akopytov)]

Hrvoje,

There is another mention of the limitation in 2.0 docs:

"
If both :option:`--stream` and :option:`--incremental` are passed to innobackupex, the incremental parameters are ignored and a full backup is created.
"

see https://code.launchpad.net/~hrvojem/percona-xtrabackup/bug924313/+merge/92772

review: Needs Fixing

[Alexey Kopytov (akopytov)]

Just noticed that "the only currently supported format is 'tar'" on the same line is also wrong for 2.0.

But that's probably should be fixed separately, when documenting the xbstream format?

review: Approve

=== modified file 'doc/source/innobackupex/innobackupex_option_reference.rst'
--- doc/source/innobackupex/innobackupex_option_reference.rst	2012-02-14 08:31:46 +0000
+++ doc/source/innobackupex/innobackupex_option_reference.rst	2012-04-03 13:23:30 +0000
@@ -121,7 +121,7 @@
 
 .. option:: --stream
 
-   This option accepts a string argument that specifies the format in which to do the streamed backup. The backup will be done to ``STDOUT`` in the specified format. Currently, the only supported format is :command:`tar`. Uses :doc:`tar4ibd <../tar4ibd/tar4ibd_binary>`, which is available in *XtraBackup* distributions. If you specify a path after this option, it will be interpreted as the value of :option:`tmpdir`.  If both :option:`--stream` and :option:`--incremental` are passed to innobackupex, the incremental parameters are ignored and a full backup is created.
+   This option accepts a string argument that specifies the format in which to do the streamed backup. The backup will be done to ``STDOUT`` in the specified format. Currently, the only supported format is :command:`tar`. Uses :doc:`tar4ibd <../tar4ibd/tar4ibd_binary>`, which is available in *XtraBackup* distributions. If you specify a path after this option, it will be interpreted as the value of :option:`tmpdir`.
 
 .. option:: --tmpdir
 

=== modified file 'doc/source/innobackupex/streaming_backups_innobackupex.rst'
--- doc/source/innobackupex/streaming_backups_innobackupex.rst	2012-02-14 08:31:46 +0000
+++ doc/source/innobackupex/streaming_backups_innobackupex.rst	2012-04-03 13:23:30 +0000
@@ -6,8 +6,6 @@
 
 This allows to pipe the stream to other programs, providing great flexibility to the output of it. For example, compression is achieved by piping the output to a compression utility.
 
-.. warning:: If both --stream and --incremental are passed to innobackupex, the incremental parameters are ignored and a full backup is created.
-
 To use this feature, you must use the :option:`--stream`, providing the format of the stream (only ``tar`` is supported at this moment) and where should the store the temporary files::
 
  $ innobackupex --stream=tar /tmp