Merge lp:~hrvojem/percona-xtrabackup/rn-2.1.6-2.2 into lp:percona-xtrabackup/2.2

[Hrvoje Matijakovic]

[Hrvoje Matijakovic (hrvojem)]

self-approved same diff as 2.1

=== modified file 'xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst'
--- xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst	2013-09-19 13:06:49 +0000
+++ xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst	2013-11-22 08:52:11 +0000
@@ -86,6 +86,10 @@
 
    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:: --force-non-empty-directories 
+
+   When specified, it makes :option:`innobackupex --copy-back` option or :option:`innobackupex --move-back` option transfer files to non-empty directories. No existing files will be overwritten. If --copy-back or --move-back has to copy a file from the backup directory which already exists in the destination directory, it will still fail with an error.
+
 .. 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.
@@ -159,6 +163,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:: --no-version-check
+
+   This option disables the version check which is enabled by the --version-check option.
+
 .. 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 your tables are stored together in a single tablespace file, it will have no effect. It is passed directly to xtrabackup's :option:`xtrabackup --parallel` option. See the :program:`xtrabackup` documentation for details

=== modified file 'xtrabackup/doc/source/installation/apt_repo.rst'
--- xtrabackup/doc/source/installation/apt_repo.rst	2013-07-25 20:00:02 +0000
+++ xtrabackup/doc/source/installation/apt_repo.rst	2013-11-22 08:52:11 +0000
@@ -37,6 +37,7 @@
  * 12.04LTS (precise) 
  * 12.10 (quantal)
  * 13.04 (raring)
+ * 13.10 (saucy)
 
 Experimental Repository
 =======================

=== added file 'xtrabackup/doc/source/release-notes/2.1/2.1.6.rst'
--- xtrabackup/doc/source/release-notes/2.1/2.1.6.rst	1970-01-01 00:00:00 +0000
+++ xtrabackup/doc/source/release-notes/2.1/2.1.6.rst	2013-11-22 08:52:11 +0000
@@ -0,0 +1,43 @@
+============================
+ |Percona XtraBackup| 2.1.6 
+============================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.1.6 on November 25th 2013. Downloads are available from our download site `here <http://www.percona.com/downloads/XtraBackup/XtraBackup-2.1.6/>`_ and :doc:`Percona Software Repositories </installation>`.
+
+This release is the current GA (Generally Available) stable release in the 2.1 series.
+
+New Features
+------------
+
+ |Percona XtraBackup| now supports logs created with the new log block checksums option `innodb_log_checksum_algorithm <http://www.percona.com/doc/percona-server/5.6/scalability/innodb_io.html#innodb_log_checksum_algorithm>`_ in |Percona Server| 5.6
+
+ New :option:`innobackupex --force-non-empty-directories` option has been implemented. When specified, it makes :option:`innobackupex --copy-back` option or :option:`innobackupex --move-back` option transfer files to non-empty directories. No existing files will be overwritten. If :option:`--copy-back` or :option:`--move-back` has to copy a file from the backup directory which already exists in the destination directory, it will still fail with an error.
+
+Bugs Fixed
+----------
+
+ :option:`innobackupex --copy-back` would fail if :option:`innodb_data_home_dir` is empty. Bug fixed :bug:`1049291`. 
+
+ A fixed initialization vector (constant string) was used while encrypting the data. This opened the encrypted stream/data to plaintext attacks among others. Bug fixed :bug:`1185343`.
+
+ :option:`innobackupex --version-check` is now on by default. Bug fixed :bug:`1227988`.
+
+ :file:`xtrabackup_slave_info` didn't contain any ``GTID`` information, which could cause ``master_auto_position`` not to work properly. Bug fixed :bug:`1239670`.
+
+ ``xtrabackup_56`` was using ``CRC32`` as the default checksum algorithm. This could cause error if the `innodb_checksum_algorithm <http://dev.mysql.com/doc/refman/5.6/en/innodb-parameters.html#sysvar_innodb_checksum_algorithm>`_ value was changed to ``strict_innodb`` value after a restore. Bug fixed :bug:`1247586`.
+
+ ``xtrabackup_56`` binary didn't store the server's `innodb_checksum_algorithm <http://dev.mysql.com/doc/refman/5.6/en/innodb-parameters.html#sysvar_innodb_checksum_algorithm>`_ value to :file:`backup-my.cnf`. This value is needed because it affects the on-disk data format. Bug fixed :bug:`1248065`.
+ 
+ Since Version Check is enabled by default in |Percona XtraBackup| 2.1.6, new :option:`innobackupex --no-version-check` option has been introduced to disable it. Bug fixed :bug:`1248900`.
+
+ |Percona XtraBackup| now supports absolute paths in :option:`innodb_data_file_path` variable. Bug fixed :bug:`382742`.
+
+ |innobackupex| wasn't able to perform backups to the ``NFS`` mount in some ``NFS`` configurations, because it was trying to preserve file ownership. Bug fixed :bug:`943750`.
+
+ |Percona XtraBackup| wouldn't back up the empty directory created with ``mkdir`` (i.e. ``test``) outside of the server which could lead to inconsistencies during the |Percona XtraDB Cluster| State Snapshot Transfer. Bug fixed :bug:`1217426`.
+
+ If the `innodb_log_arch_dir <http://www.percona.com/doc/percona-server/5.6/management/log_archiving.html#innodb_log_arch_dir>`_ variable was specified in the |Percona Server| configuration file :file:`my.cnf` |Percona XtraBackup| was unable to perform the backup. Bug fixed :bug:`1227240`.
+ 
+ Race condition in ``start_query_killer`` child code could cause parent |MySQL| connection to close. Bug fixed :bug:`1239728`.
+
+Other bugs fixed: :bug:`1248488`, :bug:`1247057`, :bug:`1250738`, :bug:`1214274`.

=== modified file 'xtrabackup/innobackupex.pl'
--- xtrabackup/innobackupex.pl	2013-11-22 08:32:46 +0000
+++ xtrabackup/innobackupex.pl	2013-11-22 08:52:11 +0000
@@ -5312,7 +5312,7 @@
 
 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-non-empty-directories
+==item --force-non-empty-directories 
 
 This option, when specified, makes --copy-back or --move-back transfer files to non-empty directories. Note that no existing files will be overwritten. If --copy-back or --nove-back has to copy a file from the backup directory which already exists in the destination directory, it will still fail with an error.
 
@@ -5405,6 +5405,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.
 
+=item --no-version-check
+
+This option disables the version check which is enabled by the --version-check option.
+
 =item --parallel=NUMBER-OF-THREADS
 
 On backup, this option specifies the number of threads the xtrabackup child process should use to back up files concurrently.  The option accepts an integer argument. It is passed directly to xtrabackup's --parallel option. See the xtrabackup documentation for details.