Merge lp:~hrvojem/percona-xtrabackup/doc-48-2.1 into lp:percona-xtrabackup/2.1

[Hrvoje Matijakovic]

[Alexey Kopytov (akopytov)]

Same comments as in the 2.0 MP.

review: Needs Fixing

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'doc/source/howtos/recipes_ibkx_compressed.rst'
--- doc/source/howtos/recipes_ibkx_compressed.rst	2012-06-04 10:29:26 +0000
+++ doc/source/howtos/recipes_ibkx_compressed.rst	2013-07-24 09:37:32 +0000
@@ -24,7 +24,7 @@
 Preparing the backup
 --------------------
 
-Before you can prepare the backup you'll need to uncompress all the files with `qpress <http://www.quicklz.com/>`_. You can use following one-liner to uncompress all the files:  :: 
+Before you can prepare the backup you'll need to uncompress all the files with `qpress <http://www.quicklz.com/>`_ (which is available from `Percona Software repositories <http://www.percona.com/doc/percona-xtrabackup/2.1/installation.html#using-percona-software-repositories>`_). You can use following one-liner to uncompress all the files:  :: 
 
   $ for bf in `find . -iname "*\.qp"`; do qpress -d $bf $(dirname $bf) && rm $bf; done
 
 
=== modified file 'doc/source/howtos/recipes_ibkx_partition.rst'
--- doc/source/howtos/recipes_ibkx_partition.rst	2012-09-19 11:35:43 +0000
+++ doc/source/howtos/recipes_ibkx_partition.rst	2013-07-24 09:37:32 +0000
@@ -103,3 +103,47 @@
 
   mysql>  ALTER TABLE name_p4 IMPORT TABLESPACE;
 
+Restoring from the backups in version 5.6
+-----------------------------------------
+
+The problem with server versions up to 5.5 is that there is no server support to import either individual partitions or all partitions of a partitioned table, so partitions could only be imported as independent tables. In |MySQL| and |Percona Server| 5.6 it is possible to exchange individual partitions with independent tables through ``ALTER TABLE`` ... ``EXCHANGE PARTITION`` command.
+
+.. note:: 
+
+  In |Percona Server| 5.6 variable :option:`innodb_import_table_from_xtrabackup` has been removed in favor of |MySQL| `Transportable Tablespaces <http://dev.mysql.com/doc/refman/5.6/en/tablespace-copying.html>`_ implementation.
+
+When importing an entire partitioned table, first import all (sub)partitions as independent tables: :: 
+
+   mysql> CREATE TABLE `name_p4` (
+   `id` int(11) NOT NULL AUTO_INCREMENT,
+   `name` text NOT NULL,
+   `imdb_index` varchar(12) DEFAULT NULL,
+   `imdb_id` int(11) DEFAULT NULL,
+   `name_pcode_cf` varchar(5) DEFAULT NULL,
+   `name_pcode_nf` varchar(5) DEFAULT NULL,
+   `surname_pcode` varchar(5) DEFAULT NULL,
+   PRIMARY KEY (`id`)
+   ) ENGINE=InnoDB AUTO_INCREMENT=2812744 DEFAULT CHARSET=utf8
+
+To restore the partition from the backup tablespace needs to be discarded for that table: ::
+
+  mysql>  ALTER TABLE name_p4 DISCARD TABLESPACE;
+
+Next step is to copy the ``.cfg`` and ``.ibd`` files from the backup to |MySQL| data directory: :: 
+
+  $ cp /mnt/backup/2013-07-18_10-29-09/imdb/name#P#p4.cfg /var/lib/mysql/imdb/name_p4.cfg
+  $ cp /mnt/backup/2013-07-18_10-29-09/imdb/name#P#p4.ibd /var/lib/mysql/imdb/name_p4.ibd
+
+Last step is to import the tablespace: ::
+
+  mysql>  ALTER TABLE name_p4 IMPORT TABLESPACE;
+
+We can now create the empty partitioned table with exactly the same schema as the table being imported: ::
+
+  mysql> CREATE TABLE name2 LIKE name;
+
+Then swap empty partitions from the newly created table with individual tables corresponding to partitions that have been exported/imported on the previous steps :: 
+
+  mysql> ALTER TABLE name2 EXCHANGE PARTITION p4 WITH TABLE name_p4;
+
+In order for this operation to be successful `following conditions <http://dev.mysql.com/doc/refman/5.6/en/partitioning-management-exchange.html>`_ have to be met.
 
=== modified file 'doc/source/innobackupex/parallel_copy_ibk.rst'
--- doc/source/innobackupex/parallel_copy_ibk.rst	2013-04-29 09:29:00 +0000
+++ doc/source/innobackupex/parallel_copy_ibk.rst	2013-07-24 09:37:32 +0000
@@ -1,8 +1,11 @@
 .. _parallel-ibk:
 
-=====================================================================
- Accelerating with :option:`--parallel` copy and `--compress-threads`
-=====================================================================
+=================================
+ Accelerating the backup process 
+=================================
+
+Accelerating with :option:`--parallel` copy and `--compress-threads`
+--------------------------------------------------------------------
 
 When performing a local backup or the streaming backup with |xbstream| option, multiple files can be copied concurrently by using the :option:`--parallel` option. This option specifies the number of threads created by |xtrabackup| to copy data files.
 
@@ -25,3 +28,12 @@
 
 Before applying logs, compressed files will need to be uncompressed.
 
+Accelerating with :option:`--rsync` option
+------------------------------------------
+
+In order to speed up the backup process and to minimize the time ``FLUSH TABLES WITH READ LOCK`` is blocking the writes, option :option:`innobackupex --rsync` should be used. 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. |innobackupex| will call the ``rsync`` twice, once before the ``FLUSH TABLES WITH READ LOCK`` and once during to minimize the time the read lock is being held. During the second ``rsync`` call, it will only synchronize the changes to non-transactional data (if any) since the first call performed before the ``FLUSH TABLES WITH READ LOCK``.
+
+.. note::
+ 
+ This option cannot be used together with :option:`innobackupex --remote-host` or :option:`innobackupex --stream` options.
+
 
=== modified file 'doc/source/innobackupex/streaming_backups_innobackupex.rst'
--- doc/source/innobackupex/streaming_backups_innobackupex.rst	2013-04-29 09:29:00 +0000
+++ doc/source/innobackupex/streaming_backups_innobackupex.rst	2013-07-24 09:37:32 +0000
@@ -12,7 +12,7 @@
 
 |innobackupex| starts |xtrabackup| in :option:`--log-stream` mode in a child process, and redirects its log to a temporary file. It then uses |xbstream| to stream all of the data files to ``STDOUT``, in a special ``xbstream`` format. See :doc:`../xbstream/xbstream` for details. After it finishes streaming all of the data files to ``STDOUT``, it stops xtrabackup and streams the saved log file too.
 
-When compression is enabled, |xtrabackup| compresses all output data, including the transaction log file and meta data files, using the specified compression algorithm. The only currently supported algorithm is 'quicklz'. The resulting files have the qpress archive format, i.e. every \*.qp file produced by xtrabackup is essentially a one-file qpress archive and can be extracted and uncompressed by the `qpress file archiver <http://www.quicklz.com/>`_. New algorithms (gzip, bzip2, etc.) may be added later with minor efforts.
+When compression is enabled, |xtrabackup| compresses all output data, including the transaction log file and meta data files, using the specified compression algorithm. The only currently supported algorithm is 'quicklz'. The resulting files have the qpress archive format, i.e. every \*.qp file produced by xtrabackup is essentially a one-file qpress archive and can be extracted and uncompressed by the `qpress file archiver <http://www.quicklz.com/>`_ which is available from `Percona Software repositories <http://www.percona.com/doc/percona-xtrabackup/2.1/installation.html#using-percona-software-repositories>`_. New algorithms (gzip, bzip2, etc.) may be added later with minor efforts.
 
 Using |xbstream| as a stream option, backups can be copied and compressed in parallel which can significantly speed up the backup process.  
 
 
=== modified file 'doc/source/percona-theme/layout.html'
--- doc/source/percona-theme/layout.html	2013-05-22 11:21:52 +0000
+++ doc/source/percona-theme/layout.html	2013-07-24 09:37:32 +0000
@@ -78,7 +78,7 @@
 
 			<div class="side-column-block">
 				<div class="a-btn-container">
-					<a title="Download PDF Manual for Percona XtraBackup 2.1" href="http://form.percona.com/PerconaXtraBackup2.1.2OperationsManual--5.20.13.html" class="a-btn-new">
+					<a title="Download PDF Manual for Percona XtraBackup 2.1" href="http://form.percona.com/PerconaXtraBackup2.1SeriesOperationsManual--5.24.13.html" class="a-btn-new">
 						<span class="a-btn-text">Download Manual</span>
 						<span class="a-btn-fixed-slide-text">PDF for version 2.1</span>
 						<span class="a-btn-icon-right"><span></span></span>