Merge lp:~hrvojem/percona-xtrabackup/bug1215912-2.2 into lp:percona-xtrabackup/2.2

[Hrvoje Matijakovic]

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'xtrabackup/doc/source/innobackupex/improved_ftwrl.rst'
--- xtrabackup/doc/source/innobackupex/improved_ftwrl.rst	2013-07-31 10:55:11 +0000
+++ xtrabackup/doc/source/innobackupex/improved_ftwrl.rst	2013-09-11 07:52:46 +0000
@@ -25,7 +25,7 @@
 
 Second option is to kill all the queries which prevent global lock from being acquired. In this case all the queries which run longer than ``FLUSH TABLES WITH READ LOCK`` are possible blockers. Although all queries can be killed, additional time can be specified for the short running queries to complete. This can be specified by :option:`innobackupex --kill-long-queries-timeout` option. This option specifies the time for queries to complete, after the value is reached, all the running queries will be killed. Default value is zero, which turns this feature off.
 
-:option:`innobackupex --kill-long-query-type` option can be used to specify all or only ``SELECT`` queries that are preventing global lock from being acquired.
+:option:`innobackupex --kill-long-query-type` option can be used to specify all or only ``SELECT`` queries that are preventing global lock from being acquired. In order to use this option xtrabackup user should have ``PROCESS`` and ``SUPER`` privileges.
 
 Options summary
 ---------------
@@ -38,7 +38,7 @@
 
 * :option:`--kill-long-queries-timeout=N` (seconds) - how many time we give for queries to complete after ``FLUSH TABLES WITH READ LOCK`` is issued before start to kill. Default if ``0``, not to kill.
 
-* :option:`--kill-long-query-type={all|update}` - which queries should be killed once :option:`kill-long-queries-timeout` has expired.
+* :option:`--kill-long-query-type={all|select}` - which queries should be killed once :option:`kill-long-queries-timeout` has expired.
 
 Example
 -------

=== modified file 'xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst'
--- xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst	2013-08-30 09:55:04 +0000
+++ xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst	2013-09-11 07:52:46 +0000
@@ -28,7 +28,7 @@
 
 .. option:: --compress-chunk-size
 
-   This option specifies the size of the internal working buffer for each compression thread, measured in bytes. It is passed directly to the xtrabackup child process. See the :program:`xtrabackup` :doc:`documentation <../xtrabackup_bin/xtrabackup_binary>` for details.
+   This option specifies the size of the internal working buffer for each compression thread, measured in bytes. It is passed directly to the xtrabackup child process. The default value is 64K. See the :program:`xtrabackup` :doc:`documentation <../xtrabackup_bin/xtrabackup_binary>` for details.
 
 .. option:: --copy-back
 
@@ -124,9 +124,9 @@
 
 .. option:: --kill-long-queries-timeout=SECONDS
 
-   This option specifies the number of seconds innobackupex waits between starting ``FLUSH TABLES WITH READ LOCK`` and killing those queries that block it. Default is 0 seconds, which means innobackupex will not attempt to kill any queries.
+   This option specifies the number of seconds innobackupex waits between starting ``FLUSH TABLES WITH READ LOCK`` and killing those queries that block it. Default is 0 seconds, which means innobackupex will not attempt to kill any queries. In order to use this option xtrabackup user should have ``PROCESS`` and ``SUPER`` privileges.
 
-.. option:: --kill-long-query-type=all|update
+.. option:: --kill-long-query-type=all|select
 
    This option specifies which types of queries should be killed to unblock the global lock. Default is "all".
 

=== modified file 'xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst'
--- xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst	2013-05-10 09:29:17 +0000
+++ xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst	2013-09-11 07:52:46 +0000
@@ -25,6 +25,10 @@
 
    This option tells |xtrabackup| to compress 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 <http://www.quicklz.com/>`_  file archiver.
 
+.. option:: --compress-chunk-size
+
+   Size of working buffer(s) for compression threads in bytes. The default value is 64K.
+
 .. option:: --compress-threads 
 
    This option specifies the number of worker threads used by |xtrabackup| for parallel data compression. This option defaults to 1. Parallel compression ('--compress-threads') can be used together with parallel file copying ('--parallel'). For example, '--parallel=4 --compress --compress-threads=2' will create 4 IO threads that will read the data and pipe it to 2 compression threads.