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

[Hrvoje Matijakovic]

=== modified file 'storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst'
--- storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst	2013-12-06 13:31:43 +0000
+++ storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst	2014-03-16 09:24:48 +0000
@@ -12,7 +12,7 @@
 
 .. 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.
+   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. innobackupex --apply-log uses InnoDB configuration from ``backup-my.cnf`` by default, or from --defaults-file, if specified. InnoDB configuration in this context means server variables that affect data format, i.e. :option:`innodb_page_size`, :option:`innodb_log_block_size`, etc. Location-related variables, like :option:`innodb_log_group_home_dir` or :option:`innodb_data_file_path` are always ignored by --apply-log, so preparing a backup always works with data files from the backup directory, rather than any external ones.
 
 .. option:: --compact
 
@@ -156,9 +156,9 @@
 
 .. option:: --no-lock
 
-   Use this option to disable table lock with ``FLUSH TABLES WITH READ 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. This option shouldn't be used if there are any ``DDL`` statements being executed or if any updates are happening on non-InnoDB tables (this includes the system MyISAM tables in the *mysql* database), otherwise it could lead to an inconsistent backup. 
+   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. This option shouldn't be used if there are any ``DDL`` statements being executed or if any updates are happening on non-InnoDB tables (this includes the system MyISAM tables in the *mysql* database), otherwise it could lead to an inconsistent 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 this option.
-
+   :file:`xtrabackup_binlog_info` is not created when --no-lock option is used (because ``SHOW MASTER STATUS`` may be inconsistent), but under certain conditions :file:`xtrabackup_binlog_pos_innodb` can be used instead to get consistent binlog coordinates as described in :ref:`working_with_binlogs`.
 .. 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.

=== modified file 'storage/innobase/xtrabackup/doc/source/xtrabackup-files.rst'
--- storage/innobase/xtrabackup/doc/source/xtrabackup-files.rst	2013-08-30 09:55:04 +0000
+++ storage/innobase/xtrabackup/doc/source/xtrabackup-files.rst	2014-03-16 09:24:48 +0000
@@ -7,7 +7,8 @@
 * Information related to the backup and the server
 
     * :file:`backup-my.cnf`
-       This file contains information to start the mini instance of InnoDB during the :option:`--apply-log`. This is **NOT** a backup of original :file:`my.cnf`.
+       This file contains information to start the mini instance of InnoDB during the :option:`--apply-log`. This is **NOT** a backup of original :file:`my.cnf`.  The InnoDB configuration is read from the file :file:`backup-my.cnf` created by |innobackupex| when the backup was made. :option:`innobackupex --apply-log` uses InnoDB configuration from ``backup-my.cnf`` by default, or from :option:`innobackupex --defaults-file`, if specified. InnoDB configuration in this context means server variables that affect data format, i.e. :option:`innodb_page_size`, :option:`innodb_log_block_size`, etc. Location-related variables, like :option:`innodb_log_group_home_dir` or :option:`innodb_data_file_path` are always ignored by :option:`innobackupex --apply-log`, so preparing a backup always works with data files from the backup directory, rather than any external ones.
+
 
     * :file:`xtrabackup_checkpoints`
        The type of the backup (e.g. full or incremental), its state (e.g. prepared) and the |LSN| range contained in it. This information is used for incremental backups.

=== modified file 'storage/innobase/xtrabackup/doc/source/xtrabackup_bin/working_with_binary_logs.rst'
--- storage/innobase/xtrabackup/doc/source/xtrabackup_bin/working_with_binary_logs.rst	2011-08-29 22:29:35 +0000
+++ storage/innobase/xtrabackup/doc/source/xtrabackup_bin/working_with_binary_logs.rst	2014-03-16 09:24:48 +0000
@@ -1,3 +1,5 @@
+.. _working_with_binlogs:
+
 Working with Binary Logs
 ========================