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

[Hrvoje Matijakovic]

=== modified file 'xtrabackup/doc/source/conf.py'
--- xtrabackup/doc/source/conf.py	2013-08-30 09:55:04 +0000
+++ xtrabackup/doc/source/conf.py	2013-09-19 13:28:27 +0000
@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.1.4'
+version = '2.2.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.1.4'
+release = '2.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -227,7 +227,7 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'PerconaXtraBackup-2.1.tex', u'Percona XtraBackup Documentation',
+  ('index', 'PerconaXtraBackup-2.2.tex', u'Percona XtraBackup Documentation',
    u'Percona LLC and/or its affiliates', 'manual'),
 ]
 

=== modified file 'xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst'
--- xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst	2013-09-11 06:23:12 +0000
+++ xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst	2013-09-19 13:28:27 +0000
@@ -238,3 +238,7 @@
 .. option:: --version
 
    This option displays the |innobackupex| version and copyright notice and then exits.
+
+.. option:: --version-check
+
+   When this option is specified, innobackupex will perform a version check against the server on the backup stage after creating a server connection.

=== modified file 'xtrabackup/doc/source/percona-theme/layout.html'
--- xtrabackup/doc/source/percona-theme/layout.html	2013-08-30 09:55:04 +0000
+++ xtrabackup/doc/source/percona-theme/layout.html	2013-09-19 13:28:27 +0000
@@ -349,7 +349,7 @@
   _gaq.push(['b._trackPageview']);
   (function() {
   var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-  ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google- analytics.com/ga.js';
+  ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
   var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();
 </script>

=== added file 'xtrabackup/doc/source/release-notes/2.1/2.1.5.rst'
--- xtrabackup/doc/source/release-notes/2.1/2.1.5.rst	1970-01-01 00:00:00 +0000
+++ xtrabackup/doc/source/release-notes/2.1/2.1.5.rst	2013-09-19 13:28:27 +0000
@@ -0,0 +1,32 @@
+============================
+ |Percona XtraBackup| 2.1.5 
+============================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.1.5 on September 19th 2013. Downloads are available from our download site `here <http://www.percona.com/downloads/XtraBackup/XtraBackup-2.1.5/>`_ 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 new form of :ref:`incremental backups <xb_incremental_ps_56>` for |Percona Server| 5.6 that uses `Log Archiving for XtraDB <http://www.percona.com/doc/percona-server/5.6/management/log_archiving.html>`_ feature.
+
+ |Percona XtraBackup| now supports new :option:`innobackupex --version-check` option. When specified, |innobackupex| will perform a version check against the server on the backup stage after creating a server connection.
+
+
+Bugs Fixed
+----------
+
+ |Percona XtraBackup| did not close temporary files created when preparing a compact backup, which would lead to excessive disk space usage until the prepare process finished. Bug fixed :bug:`1111380`.
+
+ Depending on the subroutine |innobackupex| could sometimes leave the child processes running in case of the error. |innobackupex| now makes sure that all child processes are killed if an error occurs in the script. Bug fixed :bug:`1135441`.
+ 
+ The 5.6-based binary ( ``xtrabackup_56``), which is used to backup both |MySQL| 5.6 and |Percona Server| 5.6 servers, did not support Percona Server-specific :option:`innodb_log_block_size` option in Percona Server 5.6.11+ and would fail when trying to backup a server with a non-default :option:`innodb_log_block_size` value. Bug fixed :bug:`1194828`.
+
+ |Percona XtraBackup| would stop in case log block numbers had to wrap around, which only happens once per 1 GB of log writes, and the wrap-around point was between the last checkpoint and the current log tail at the time the backup starts. Bug fixed :bug:`1206309`.
+ 
+ ``xtrabackup_56`` binary would fail to create a suspend file, which would result in an error. Bug fixed :bug:`1210266`.
+
+ Regression was introduced in |Percona XtraBackup| 2.1.4 which lead to ``cp`` utility being used to copy metadata files even if the :option:`innobackupex --rsync` option was used. Bug fixed :bug:`1211263`.
+
+Other bugs fixed: bug fixed :bug:`1214272`, bug fixed :bug:`1214730`, bug fixed :bug:`1213102`, bug fixed :bug:`1213036`, bug fixed :bug:`1204045`, bug fixed :bug:`1154476`, bug fixed :bug:`1195402`, bug fixed :bug:`1195055`.

=== added file 'xtrabackup/doc/source/xtrabackup_bin/incremental_backups_with_ps_56.rst'
--- xtrabackup/doc/source/xtrabackup_bin/incremental_backups_with_ps_56.rst	1970-01-01 00:00:00 +0000
+++ xtrabackup/doc/source/xtrabackup_bin/incremental_backups_with_ps_56.rst	2013-09-19 13:28:27 +0000
@@ -0,0 +1,69 @@
+.. _xb_incremental_ps_56:
+
+===================================================
+ Incremental Backups with Log Archiving for XtraDB
+===================================================
+
+|Percona Server| 5.6.11-60.3 has introduced a new feature called `Log Archiving for XtraDB <http://www.percona.com/doc/percona-server/5.6/management/log_archiving.html>`_. This feature makes copies of the old log files before they are overwritten, thus saving all the redo log for a write workload.
+
+When log archiving is enabled, it duplicates all redo log writes in a separate set of files in addition to normal redo log writing, creating new files as necessary.
+
+Archived log file name format is ``ib_log_archive_<startlsn>``. The start LSN marks the log sequence number when the archive was started. An example of the archived log files should look like this: :: 
+
+ ib_log_archive_00000000010145937920
+ ib_log_archive_00000000010196267520
+
+In order to enable this feature, variable :option:`innodb_log_archive` should be set to ``ON``. Once the feature has been enabled, directory specified with :option:`innodb_log_arch_dir` (|MySQL| datadir by default) will contain the archived log files. 
+
+Creating the Backup
+===================
+
+To make an incremental backup, begin with a full backup as usual. The |xtrabackup| binary writes a file called :file:`xtrabackup_checkpoints` into the backup's target directory. This file contains a line showing the ``to_lsn``, which is the database's :term:`LSN` at the end of the backup. :doc:`Create the full backup <creating_a_backup>` with a command such as the following: ::
+
+  xtrabackup --backup --target-dir=/data/backup/ --datadir=/var/lib/mysql/
+
+If you want a usable full backup, use :doc:`innobackupex <../innobackupex/innobackupex_script>` since `xtrabackup` itself won't copy table definitions, triggers, or anything else that's not .ibd.
+
+If you look at the :file:`xtrabackup_checkpoints` file, you should see some contents similar to the following: ::
+
+  backup_type = full-backuped
+  from_lsn = 0
+  to_lsn = 2066277743
+  last_lsn = 2066277743
+  compact = 0
+
+Using the Log Archiving to prepare the backup
+=============================================
+
+In order to prepare the backup we need to specify the directory that contains the archived logs with the :option:`xtrabackup --archived-logs-dir` option: ::
+
+ xtrabackup --prepare --target-dir=/data/backup/ --archived-logs-dir=/data/archived-logs/
+
+This command will use archived logs, replay them against the backup folder and bring them up to date with the latest archived log.
+
+Output should look like this: ::
+
+ InnoDB: Doing recovery: scanned up to log sequence number 712612864 (0 %)
+ InnoDB: Doing recovery: scanned up to log sequence number 717855744 (0 %)
+ InnoDB: Doing recovery: scanned up to log sequence number 723098624 (1 %)
+ InnoDB: Doing recovery: scanned up to log sequence number 728341504 (1 %)
+ ...
+ InnoDB: Apply batch completed
+ InnoDB: Doing recovery: scanned up to log sequence number 2066277743 (99 %)
+ 130919  8:12:44  InnoDB: Starting an apply batch of log records to the database...
+ InnoDB: Progress in percents: 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 
+ InnoDB: Apply batch completed
+ 130919  8:12:45 Percona XtraDB (http://www.percona.com) 5.1.70-14.6 started; log sequence number 2066277743
+
+After this is completed successfully backup can be restored.
+
+.. note:: 
+
+   Archived logs can be applied to backup data several times, for example to decreasing backup size or time required for preparing the backup.
+
+Additional option is available if you need to restore a backup to specific point in time. By adding the :option:`xtrabackup --to-archived-lsn` option you can specify the LSN to which the backup will be prepared. ::
+
+ xtrabackup --prepare --target-dir=/data/backup/ --archived-logs-dir=/data/archived-logs/ --to-archived-lsn=8155020800
+
+This will prepare the backup up to the specified Log Sequence Number.
+ 

=== modified file 'xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst'
--- xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst	2013-09-11 06:23:12 +0000
+++ xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst	2013-09-19 13:28:27 +0000
@@ -13,6 +13,10 @@
 
    This option causes only the redo stage to be performed when preparing a backup. It is very important for incremental backups.
 
+.. option:: --archived-logs-dir 
+
+   This option is used to specify the directory containing the archived logs. It can only be used with the :option:`xtrabackup --prepare` option.
+
 .. option:: --backup
 
    Make a backup and place it in :option:`--target-dir`. See :doc:`Creating a backup <creating_a_backup>`.
@@ -179,6 +183,10 @@
 
    This option is currently not used for anything except printing out the correct tmpdir parameter when :option:`--print-param` is used.
 
+.. option:: --to-archived-lsn
+
+   This option is used to specify the LSN to which the logs should be applied when backups are being prepared. It can only be used with the :option:`xtrabackup --prepare` option.
+
 .. option:: --use-memory=#
 
    This option affects how much memory is allocated for preparing a backup with :option:`--prepare`, or analyzing statistics with :option:`--stats`. Its purpose is similar to :term:`innodb_buffer_pool_size`. It does not do the same thing as the similarly named option in Oracle's InnoDB Hot Backup tool. The default value is 100MB, and if you have enough available memory, 1GB to 2GB is a good recommended value.

=== modified file 'xtrabackup/doc/source/xtrabackup_bin/xtrabackup_binary.rst'
--- xtrabackup/doc/source/xtrabackup_bin/xtrabackup_binary.rst	2013-04-29 11:08:57 +0000
+++ xtrabackup/doc/source/xtrabackup_bin/xtrabackup_binary.rst	2013-09-19 13:28:27 +0000
@@ -32,6 +32,7 @@
    :maxdepth: 1
 
    incremental_backups
+   incremental_backups_with_ps_56
    partial_backups
    compact_backups