Merge lp:~hrvojem/percona-xtrabackup/bug1066978-2.1 into lp:percona-xtrabackup/2.1

[Hrvoje Matijakovic]

[Alexey Kopytov (akopytov)]

Everything looks good, except a couple of 2.1-specific things:

- The 2.1 MP should have "lp:percona-xtrabackup/2.1" instead of
"lp:percona-xtrabackup/2.0" in compiling_xtrabackup.rst.

- --remote-host was removed in 2.1, so it shouldn't be mentioned in
    innobackupex help

review: Needs Fixing

[Alexey Kopytov (akopytov)]

Text conflict in doc/source/innobackupex/innobackupex_option_reference.rst
Text conflict in utils/build.sh

review: Needs Fixing

[Alexey Kopytov (akopytov)]

hmm, not sure what happened, but where did the "rearrange alphabetically" changes go?

and this one is probably unintentional:

=== modified file 'utils/build.sh' (properties changed: +x to -x)

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'BUILD.txt'
--- BUILD.txt	2012-06-04 10:29:26 +0000
+++ BUILD.txt	2012-11-22 09:58:24 +0000
@@ -30,8 +30,7 @@
   ================== =========  =============================================
   Value              Alias      Server
   ================== =========  =============================================
-  innodb51_builtin   5.1	build against built-in InnoDB in MySQL 5.1
-  innodb51           plugin	build agsinst InnoDB plugin in MySQL 5.1
+  innodb51           plugin	build against InnoDB plugin in MySQL 5.1
   innodb55           5.5	build against InnoDB in MySQL 5.5
   xtradb51           xtradb     build against Percona Server with XtraDB 5.1
   xtradb55           xtradb55   build against Percona Server with XtraDB 5.5
 
=== modified file 'doc/Makefile'
--- doc/Makefile	2012-08-03 12:12:02 +0000
+++ doc/Makefile	2012-11-22 09:58:24 +0000
@@ -38,7 +38,7 @@
 
 html:
 	@echo "Downloading percona-theme ..."
-	@wget -O percona-theme.tar.gz http://percona.com/docs/theme/percona-xtrabackup/2.0
+	@wget -O percona-theme.tar.gz http://percona.com/docs/theme/percona-xtrabackup/2.1
 	@echo "Extracting theme."
 	@tar -zxf percona-theme.tar.gz
 	@rm -rf source/percona-theme
 
=== modified file 'doc/source/innobackupex/innobackupex_option_reference.rst'
--- doc/source/innobackupex/innobackupex_option_reference.rst	2012-11-13 05:25:19 +0000
+++ doc/source/innobackupex/innobackupex_option_reference.rst	2012-11-22 09:58:24 +0000
@@ -10,106 +10,69 @@
 Options
 =======
 
-.. option:: --help
-
-   This option displays a help screen and exits.
-
-.. option:: --version
-
-   This option displays the |innobackupex| version and copyright notice and then exits.
-
 .. option:: --apply-log
 
    Prepare a backup in ``BACKUP-DIR`` by applying the transaction log file named :file:`xtrabackup_logfile` located in the same directory. Also, create new transaction logs. The InnoDB configuration is read from the file :file:`backup-my.cnf` created by |innobackupex| when the backup was made.
 
-.. option:: --redo-only
-
-   This option is passed directly to xtrabackup's :option:`xtrabackup --apply-log-only` option. This forces :program:`xtrabackup` to skip the "rollback" phase and do a "redo" only. This is necessary if the backup will have incremental changes applied to it later. See the |xtrabackup| :doc:`documentation <../xtrabackup_bin/incremental_backups>` for details.
+.. option:: --compact
+
+   Create a compact backup with all secondary index pages omitted. This option is passed directly to xtrabackup.  See the :program:`xtrabackup` :doc:`documentation <../xtrabackup_bin/xtrabackup_binary>` for details.
+
+.. option:: --compress
+
+   This option instructs xtrabackup to compress backup copies of InnoDB data files. It is passed directly to the xtrabackup child process. See the :program:`xtrabackup` :doc:`documentation <../xtrabackup_bin/xtrabackup_binary>` for details.
+
+.. option::  --compress-threads
+
+   This option specifies the number of worker threads that will be used for parallel compression. It is passed directly to the xtrabackup child process. See the :program:`xtrabackup` :doc:`documentation <../xtrabackup_bin/xtrabackup_binary>` for details.
 
 .. option:: --copy-back
 
     Copy all the files in a previously made backup from the backup directory to their original locations.
 
-.. option:: --move-back
-
-    Move all the files in a previously made backup from the backup directory to their original locations. As this option removes backup files, it must be used with caution.
-
-.. option:: --include=REGEXP
-
-   This option is a regular expression to be matched against table names in ``databasename.tablename`` format. It is passed directly to :program:`xtrabackup` 's :option:`xtrabackup --tables` option. See the :program:`xtrabackup` documentation for details.
+.. option:: --databases=LIST
+
+   This option specifies the list of databases that |innobackupex| should back up. The option accepts a string argument or path to file that contains the list of databases to back up. The list is of the form "databasename1[.table_name1] databasename2[.table_name2] . . .". If this option is not specified, all databases containing |MyISAM| and |InnoDB| tables will be backed up. Please make sure that --databases contains all of the |InnoDB| databases and tables, so that all of the innodb.frm files are also backed up. In case the list is very long, this can be specified in a file, and the full path of the file can be specified instead of the list. (See option --tables-file.)
 
 .. option:: --defaults-file=[MY.CNF]
 
    This option accepts a string argument that specifies what file to read the default MySQL options from. It is also passed directly to :program:`xtrabackup` 's defaults-file option. See the :program:`xtrabackup` :doc:`documentation <../xtrabackup_bin/xtrabackup_binary>` for details.
 
-.. option:: --databases=LIST
-
-   This option specifies the list of databases that |innobackupex| should back up. The option accepts a string argument or path to file that contains the list of databases to back up. The list is of the form "databasename1[.table_name1] databasename2[.table_name2] . . .". If this option is not specified, all databases containing |MyISAM| and |InnoDB| tables will be backed up. Please make sure that --databases contains all of the |InnoDB| databases and tables, so that all of the innodb.frm files are also backed up. In case the list is very long, this can be specified in a file, and the full path of the file can be specified instead of the list. (See option --tables-file.)
-
-.. option:: --tables-file
-
-   This option accepts a string argument that specifies the file in which there are a list of names of the form ``database.table``, one per line. The option is passed directly to :program:`xtrabackup` 's :option:`--tables-file` option.
-
-.. option:: --throttle
-
-   This option accepts an integer argument that specifies the number of I/O operations (i.e., pairs of read+write) per second. It is passed directly to xtrabackup's :option:`xtrabackup --throttle` option.
+.. option:: --defaults-group=GROUP-NAME
+
+   This option accepts a string argument that specifies the group which should be read from the configuration file. This is needed if you use mysqld_multi.
 
 .. option:: --export
 
    This option is passed directly to :option:`xtrabackup --export` option. It enables exporting individual tables for import into another server. See the |xtrabackup| documentation for details.
 
-.. option:: --use-memory
-
-   This option accepts a string argument that specifies the amount of memory in bytes for :program:`xtrabackup` to use for crash recovery while preparing a backup. Multiples are supported providing the unit (e.g. 1MB, 1GB). It is used only with the option :option:`--apply-log`. It is passed directly to |xtrabackup| 's :option:`xtrabackup --use-memory` option. See the |xtrabackup| documentation for details.
-
-.. option:: --password=PASSWORD
-
-   This option accepts a string argument specifying the password to use when connecting to the database. It is passed to the :command:`mysql` child process without alteration. See :command:`mysql --help` for details.
-
-.. option:: --user=USER
-
-   This option accepts a string argument that specifies the user (i.e., the *MySQL* username used when connecting to the server) to login as, if that's not the current user. It is passed to the mysql child process without alteration. See :command:`mysql --help` for details.
-
-.. option:: --port=PORT
-
-   This option accepts a string argument that specifies the port to use when connecting to the database server with TCP/IP. It is passed to the :command:`mysql` child process. It is passed to the :command:`mysql` child process without alteration. See :command:`mysql --help` for details.
-
-.. option:: --defaults-group
-
-   This option accepts a string argument that specifies the group which should be read from the configuration file. This is needed if you use mysqld_multi.
-
-.. option:: --socket
-
-   This option accepts a string argument that specifies the socket to use when connecting to the local database server with a UNIX domain socket. It is passed to the mysql child process without alteration. See :command:`mysql --help` for details.
+.. option:: --extra-lsndir=DIRECTORY
+
+   This option accepts a string argument that specifies the directory in which to save an extra copy of the :file:`xtrabackup_checkpoints` file. It is passed directly to |xtrabackup|'s :option:`--extra-lsndir` option. See the :program:`xtrabackup` documentation for details.
+
+.. 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:: --help
+
+   This option displays a help screen and exits.
 
 .. option:: --host=HOST
 
    This option accepts a string argument that specifies the host to use when connecting to the database server with TCP/IP. It is passed to the mysql child process without alteration. See :command:`mysql --help` for details.
 
-.. option:: --no-timestamp
-
-   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.
-
-.. option:: --no-lock
-
-   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.
-   If you are considering to use :option:`--no-lock` because your backups are failing to acquire the lock, this could be because of incoming replication events preventing the lock from succeeding. Please try using :option:`--safe-slave-backup` to momentarily stop the replication slave thread, this may help the backup to succeed and you then don't need to resort to using :option:`--no-lock`.
-
-.. 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` or :option:`--move-back` is used, :program:`xtrabackup` is used unless other is specified.
+.. option:: --ibbackup=IBBACKUP-BINARY
+
+   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` or :option:`--move-back` is used, :program:`xtrabackup` is used unless other is specified.
+
+.. option:: --include=REGEXP
+
+   This option is a regular expression to be matched against table names in ``databasename.tablename`` format. It is passed directly to |xtrabackup|'s :option:`xtrabackup --tables` option. See the :program:`xtrabackup` documentation for details.
 
 .. option:: --incremental
 
-   This option tells :program:`xtrabackup` to create an incremental backup, rather than a full one. It is passed to the :program:`xtrabackup` child process. When this option is specified, either :option:`--incremental-lsn` or :option:`--incremental-basedir` can also be given. If neither option is given, option :option:`--incremental-basedir` is passed to :program:`xtrabackup` by default, set to the first timestamped backup directory in the backup base directory.
+   This option tells |xtrabackup| to create an incremental backup, rather than a full one. It is passed to the |xtrabackup| child process. When this option is specified, either :option:`--incremental-lsn` or :option:`--incremental-basedir` can also be given. If neither option is given, option :option:`--incremental-basedir` is passed to :program:`xtrabackup` by default, set to the first timestamped backup directory in the backup base directory.
 
 .. option:: --incremental-basedir=DIRECTORY
 
@@ -121,23 +84,40 @@
 
 .. option:: --incremental-lsn
 
-   This option accepts a string argument that specifies the log sequence number (:term:`LSN`) to use for the incremental backup. It is used with the :option:`--incremental` option. It is used instead of specifying :option:`--incremental-basedir`. For databases created by *MySQL* and *Percona Server* 5.0-series versions, specify the as two 32-bit integers in high:low format. For databases created in 5.1 and later, specify the LSN as a single 64-bit integer. 
-
-.. option:: --extra-lsndir=DIRECTORY
-
-   This option accepts a string argument that specifies the directory in which to save an extra copy of the :file:`xtrabackup_checkpoints` file. It is passed directly to |xtrabackup|'s :option:`--extra-lsndir` option. See the :program:`xtrabackup` documentation for details.
-
-.. option:: --stream=STREAMNAME
-
-   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, supported formats are `tar` and `xbstream`. Uses :doc:`xbstream <../xbstream/xbstream>`, 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=DIRECTORY
-
-   This option accepts a string argument that specifies the location where a temporary file will be stored. It should be used when :option:`--stream` is specified. For these options, the transaction log will first be stored to a temporary file, before streaming. 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.
+   This option accepts a string argument that specifies the log sequence number (:term:`LSN`) to use for the incremental backup. It is used with the :option:`--incremental` option. It is used instead of specifying :option:`--incremental-basedir`. For databases created by *MySQL* and *Percona Server* 5.0-series versions, specify the as two 32-bit integers in high:low format. For databases created in 5.1 and later, specify the LSN as a single 64-bit integer.
+
+.. option:: --move-back
+
+    Move all the files in a previously made backup from the backup directory to their original locations. As this option removes backup files, it must be used with caution.
+
+.. option:: --no-lock
+
+   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.
+   If you are considering to use :option:`--no-lock` because your backups are failing to acquire the lock, this could be because of incoming replication events preventing the lock from succeeding. Please try using :option:`--safe-slave-backup` to momentarily stop the replication slave thread, this may help the backup to succeed and you then don't need to resort to using :option:`--no-lock`
+
+.. option:: --no-timestamp
+
+   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:: --parallel=NUMBER-OF-THREADS
 
-   This option accepts an integer argument that specifies the number of threads the :program:`xtrabackup` child process should use to back up files concurrently.  Note that this option works on file level, that is, if you have several .ibd files, they will be copied in parallel. If you have just single big .ibd file, it will have no effect. It is passed directly to xtrabackup's :option:`xtrabackup --parallel` option. See the :program:`xtrabackup` documentation for details.
+   This option accepts an integer argument that specifies the number of threads the :program:`xtrabackup` child process should use to back up files concurrently.  Note that this option works on file level, that is, if you have several .ibd files, they will be copied in parallel. If you have just single big .ibd file, it will have no effect. It is passed directly to xtrabackup's :option:`xtrabackup --parallel` option. See the :program:`xtrabackup` documentation for details
+
+.. option:: --password=PASSWORD
+
+   This option accepts a string argument specifying the password to use when connecting to the database. It is passed to the :command:`mysql` child process without alteration. See :command:`mysql --help` for details.
+
+.. option:: --port=PORT
+
+   This option accepts a string argument that specifies the port to use when connecting to the database server with TCP/IP. It is passed to the :command:`mysql` child process. It is passed to the :command:`mysql` child process without alteration. See :command:`mysql --help` for details.
+
+.. option:: --redo-only
+
+   This option is passed directly to xtrabackup's :option:`xtrabackup --apply-log-only` option. This forces :program:`xtrabackup` to skip the "rollback" phase and do a "redo" only. This is necessary if the backup will have incremental changes applied to it later. See the |xtrabackup| :doc:`documentation <../xtrabackup_bin/incremental_backups>` for details.
+
+.. option:: --rsync
+
+   Uses the :program:`rsync` utility to optimize local file transfers. When this option is specified, :program:`innobackupex` uses :program:`rsync` to copy all non-InnoDB files instead of spawning a separate :program:`cp` for each file, which can be much faster for servers with a large number of databases or tables.  This option cannot be used together with :option:`--stream`.
 
 .. option:: --safe-slave-backup
 
@@ -147,6 +127,46 @@
 
    How many seconds :option:`--safe-slave-backup`` should wait for ``Slave_open_temp_tables`` to become zero. Defaults to 300 seconds.
 
-.. option:: --rsync
-
-   Use the :program:`rsync` utility to optimize local file transfers. When this option is specified, :program:`innobackupex` uses :program:`rsync` to copy all non-InnoDB files instead of spawning a separate :program:`cp` for each file, which can be much faster for servers with a large number of databases or tables.  This option cannot be used together with :option:`--stream`.
+.. option:: --scpopt = SCP-OPTIONS
+
+   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``.
+
+.. option:: --sshopt = SSH-OPTIONS
+
+   This option accepts a string argument that specifies the command line options to pass to :command:`ssh` when the option :option:`--remost-host` is specified.
+
+.. 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.
+
+.. option:: --socket
+
+   This option accepts a string argument that specifies the socket to use when connecting to the local database server with a UNIX domain socket. It is passed to the mysql child process without alteration. See :command:`mysql --help` for details.
+
+.. option:: --stream=STREAMNAME
+
+   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, supported formats are `tar` and `xbstream`. Uses :doc:`xbstream <../xbstream/xbstream>`, 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:: --tables-file=FILE
+
+   This option accepts a string argument that specifies the file in which there are a list of names of the form ``database.table``, one per line. The option is passed directly to :program:`xtrabackup` 's :option:`--tables-file` option.
+
+.. option:: --throttle=IOS
+
+   This option accepts an integer argument that specifies the number of I/O operations (i.e., pairs of read+write) per second. It is passed directly to xtrabackup's :option:`xtrabackup --throttle` option.
+
+.. option:: --tmpdir=DIRECTORY
+
+   This option accepts a string argument that specifies the location where a temporary file will be stored. It should be used when :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 specified, the default is to use the value of ``tmpdir`` read from the server configuration.
+
+.. option:: --use-memory
+
+   This option accepts a string argument that specifies the amount of memory in bytes for :program:`xtrabackup` to use for crash recovery while preparing a backup. Multiples are supported providing the unit (e.g. 1MB, 1GB). It is used only with the option :option:`--apply-log`. It is passed directly to |xtrabackup| 's :option:`xtrabackup --use-memory` option. See the |xtrabackup| documentation for details.
+
+.. option:: --user=USER
+
+   This option accepts a string argument that specifies the user (i.e., the *MySQL* username used when connecting to the server) to login as, if that's not the current user. It is passed to the mysql child process without alteration. See :command:`mysql --help` for details.
+
+.. option:: --version
+
+   This option displays the |innobackupex| version and copyright notice and then exits.
 
=== modified file 'doc/source/installation/compiling_xtrabackup.rst'
--- doc/source/installation/compiling_xtrabackup.rst	2012-06-04 10:29:26 +0000
+++ doc/source/installation/compiling_xtrabackup.rst	2012-11-22 09:58:24 +0000
@@ -4,11 +4,7 @@
 
 The source code is available from the *Launchpad* project `here <https://launchpad.net/percona-xtrabackup>`_. The easiest way to get the code is with :command:`bzr branch` of the desired release, such as the following: ::
 
-  bzr branch lp:percona-xtrabackup/1.6
-
-or ::
-
-  bzr branch lp:percona-xtrabackup
+  bzr branch lp:percona-xtrabackup/2.0
 
 You should then have a directory named after the release you branched, such as ``percona-xtrabackup``.
 
@@ -23,8 +19,8 @@
 
 In Debian-based distributions, you need to: ::
 
-  $ apt-get install build-essential flex bison automake autoconf bzr \
-    libtool cmake libaio-dev mysql-client libncurses-dev zlib1g-dev
+  $ apt-get install debhelper autotools-dev libaio-dev wget automake \
+    libtool bison libncurses-dev libz-dev cmake bzr
 
 In ``RPM``-based distributions, you need to: ::
 
@@ -41,8 +37,7 @@
   ================== =========  ============================================
   Value              Alias      Server
   ================== =========  ============================================
-  innodb51_builtin   5.1	build against built-in InnoDB in MySQL 5.1
-  innodb51           plugin	build agsinst InnoDB plugin in MySQL 5.1
+  innodb51           plugin	build against InnoDB plugin in MySQL 5.1
   innodb55           5.5	build against InnoDB in MySQL 5.5
   xtradb51           xtradb     build against Percona Server with XtraDB 5.1
   xtradb55           xtradb55   build against Percona Server with XtraDB 5.5
 
=== modified file 'doc/source/percona-theme/layout.html'
--- doc/source/percona-theme/layout.html	2012-09-19 11:35:43 +0000
+++ doc/source/percona-theme/layout.html	2012-11-22 09:58:24 +0000
@@ -74,14 +74,7 @@
 					</div>
 				</div>
 
-			<div class="side-column-block">
-				<div class="a-btn-container">
-					<a title="Download PDF Manual for Percona XtraBackup 2.0" href="http://form.percona.com/Percona_XtraBackup_2_0_Operations_Manual.html" class="a-btn-new">
-						<span class="a-btn-text">Download Manual</span>
-						<span class="a-btn-fixed-slide-text">PDF for version 2.0</span>
-						<span class="a-btn-icon-right"><span></span></span>
-					</a>
-				</div></div>
+			
 			
 			<div class="percona_com_ad" style="width:220px;"><script type="text/javascript" src="http://www.percona.com/ads.php?size=220x120"></script></div>
 							
 
=== modified file 'doc/source/release-notes/2.0/2.0.3.rst'
--- doc/source/release-notes/2.0/2.0.3.rst	2012-10-01 09:22:03 +0000
+++ doc/source/release-notes/2.0/2.0.3.rst	2012-11-22 09:58:24 +0000
@@ -18,7 +18,7 @@
 
   * |XtraBackup| 2.0.2 was not backwards compatible which caused incremental backups created with previous versions to fail on prepare. Bug fixed :bug:`1038127` (*Sergei Glushchenko*).
 
-  * Fix for bug :bug:`1022562` introduced a regression that may potentially lead to a 5x increase in disk space occupied by incremental backups. Bug fixed :bug:`1028949` (*Laurynas Biveinis*).
+  * Fix for bug :bug:`1022562` introduced a regression that may potentially lead to a 5x increase in disk space occupied by incremental backups. Bug fixed :bug:`1043762` (*Laurynas Biveinis*).
 
   * A regression was introduced in fix for bug :bug:`932623` which caused incorrect handling of compressed tablespaces with the page size of 16K, that were created between the last full or incremental and the next incremental backup. Bugs fixed :bug:`1049174` and :bug:`1044398` (*Laurynas Biveinis*).
 
 
=== modified file 'doc/source/xtrabackup_bin/configuring.rst'
--- doc/source/xtrabackup_bin/configuring.rst	2011-07-07 05:32:50 +0000
+++ doc/source/xtrabackup_bin/configuring.rst	2012-11-22 09:58:24 +0000
@@ -3,7 +3,7 @@
 
 All of the |xtrabackup| configuration is done through options, which behave exactly like standard |MySQL| program options: they can be specified either at the command-line, or through a file such as :file:`/etc/my.cnf`.
 
-The |xtrabackup| binary reads the ``[myslqd]`` and ``[xtrabackup]`` sections from any configuration files, in that order. That is so that it can read its options from your existing |MySQL| installation, such as the :term:`datadir` or some of the |InnoDB| options. If you want to override these, just specify them in the ``[xtrabackup]`` section, and because it is read later, it will take precedence.
+The |xtrabackup| binary reads the ``[mysqld]`` and ``[xtrabackup]`` sections from any configuration files, in that order. That is so that it can read its options from your existing |MySQL| installation, such as the :term:`datadir` or some of the |InnoDB| options. If you want to override these, just specify them in the ``[xtrabackup]`` section, and because it is read later, it will take precedence.
 
 You don't need to put any configuration in your :file:`my.cnf` if you don't want to. You can simply specify the options on the command-line. Normally, the only thing you might find convenient to place in the ``[xtrabackup]`` section of your :file:`my.cnf` file is the ``target_dir`` option to default the directory in which the backups will be placed, for example,
 
 
=== modified file 'innobackupex'
--- innobackupex	2012-11-21 13:51:49 +0000
+++ innobackupex	2012-11-22 09:58:24 +0000
@@ -2769,6 +2769,10 @@
 
 This option is passed directly to xtrabackup's --apply-log-only option. This forces xtrabackup to skip the "rollback" phase and do a "redo" only. This is necessary if the backup will have incremental changes applied to it later. See the xtrabackup documentation for details. 
 
+=item --rsync
+
+Uses the rsync utility to optimize local file transfers. When this option is specified, innobackupex uses rsync to copy all non-InnoDB files instead of spawning a separate cp for each file, which can be much faster for servers with a large number of databases or tables.  This option cannot be used together with --stream.
+
 =item --safe-slave-backup
 
 Stop slave SQL thread and wait to start backup until Slave_open_temp_tables in "SHOW STATUS" is zero. If there are no open temporary tables, the backup will take place, otherwise the SQL thread will be started and stopped until there are no open temporary tables. The backup will fail if Slave_open_temp_tables does not become zero after --safe-slave-backup-timeout seconds. The slave SQL thread will be restarted when the backup finishes.
@@ -2785,7 +2789,7 @@
 
 This option specifies the socket to use when connecting to the local database server with a UNIX domain socket.  The option accepts a string argument. It is passed to the mysql child process without alteration. See mysql --help for details.
 
-=item --stream=[tar|. . .]
+=item --stream=STREAMNAME
 
 This option specifies the format in which to do the streamed backup.  The option accepts a string argument. The backup will be done to STDOUT in the specified format. Currently, the only supported formats are tar and xbstream. This option is passed directly to xtrabackup's --stream option.
 
@@ -2799,7 +2803,7 @@
 
 =item --tmpdir=DIRECTORY
 
-This option specifies the location where a temporary file will be stored.  The option accepts a string argument. It should be used when --stream is specified. For these options, the transaction log will first be stored to a temporary file, before streaming. 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.
+This option specifies the location where a temporary file will be stored.  The option accepts a string argument. It should be used when --stream is specified. For these options, the transaction log will first be stored to a temporary file, before streaming. This option specifies the location where that temporary file will be stored. If the option is not specified, the default is to use the value of tmpdir read from the server configuration.
 
 =item --use-memory=B
 
 
=== modified file 'utils/build.sh'
--- utils/build.sh	2012-11-14 01:02:10 +0000
+++ utils/build.sh	2012-11-22 09:58:24 +0000
@@ -43,7 +43,7 @@
     echo
     echo "Usage: `basename $0` CODEBASE"
     echo "where CODEBASE can be one of the following values or aliases:"
-    echo "  innodb51         | plugin	build agsinst InnoDB plugin in MySQL 5.1"
+    echo "  innodb51         | plugin	build against InnoDB plugin in MySQL 5.1"
     echo "  innodb55         | 5.5	build against InnoDB in MySQL 5.5"
     echo "  xtradb51         | xtradb   build against Percona Server with XtraDB 5.1"
     echo "  xtradb55         | xtradb55 build against Percona Server with XtraDB 5.5"