Merge lp:~hrvojem/percona-server/bug955266-5.5 into lp:percona-server/5.5

[Hrvoje Matijakovic]

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'doc/source/management/innodb_lru_dump_restore.rst'
--- doc/source/management/innodb_lru_dump_restore.rst	2012-03-16 10:41:48 +0000
+++ doc/source/management/innodb_lru_dump_restore.rst	2012-03-27 13:30:23 +0000
@@ -19,7 +19,6 @@
 
 After finishing the restore operation, the thread switches into dump mode, to periodically dump the LRU. The period is specified by the configuration variable's value in seconds. For example, if you set the variable to 60, then the thread saves the LRU list once per minute.
 
-
 Manual Operation
 ================
 
@@ -91,7 +90,6 @@
 
 The requested number of pages is the number of pages that were in the LRU dump file. A page might not be read if it is already in the buffer pool, or for some other miscellaneous reasons, so the number of pages read can be less than the number requested.
 
-
 Implementation Details
 ======================
 
@@ -102,6 +100,12 @@
 The dump file is not deleted after loading, so you should delete it if you wish to disable the feature. For example, suppose you dump the LRU, and then some time later you decide to enable automatic dumping and reloading. You set the configuration variable and restart |MySQL|. Upon restart, the server will load the LRU to its state in the previously saved file, which might be very stale and not what you want to happen.
 
 
+Block Startup until LRU dump is loaded
+=======================================
+
+|Percona Server| provides a boolean option to block the start of XtraDB until LRU is preloaded from dump. When the variable :variable:`innodb_blocking_buffer_pool_restore` is set to ON, XtraDB waits until the restore of the dump is completed before reporting successful startup to the server.  This variable is OFF by default.
+
+
 Version Specific Information
 ============================
 
@@ -129,6 +133,21 @@
 
  This variable was renamed to :variable:`innodb_buffer_pool_restore_at_startup`, beginning in release 5.5.10-20.1. It still exists as :variable:`innodb_auto_lru_dump` in versions prior to that.
 
+
+.. variable:: innodb_blocking_buffer_pool_restore
+
+     :version 5.5.16-22.0: Added
+     :cli: Yes
+     :conf: Yes
+     :scope: Global
+     :dyn: No
+     :vartype: Boolean
+     :default: OFF
+     :range: ON/OFF
+
+When this variable is set to ON XtraDB waits until the restore of the dump is completed before reporting successful startup to the server.
+
+
 .. variable:: innodb_buffer_pool_restore_at_startup
 
      :version 5.5.10-20.1: Added.
 
=== modified file 'doc/source/release-notes/Percona-Server-5.5.16-22.0.rst'
--- doc/source/release-notes/Percona-Server-5.5.16-22.0.rst	2011-10-24 11:15:33 +0000
+++ doc/source/release-notes/Percona-Server-5.5.16-22.0.rst	2012-03-27 13:30:23 +0000
@@ -18,7 +18,7 @@
 
 Using this approach, support for Fake Changes have been implemented in order to remove the overhead and make it faster.
 
-By reading the rows for “INSERT“, “UPDATE“ and “DELETE“ statements but not updating them (Fake Changes), the rollback is very fast as in most cases there is nothing to do.
+By reading the rows for "INSERT", "UPDATE" and "DELETE" statements but not updating them (Fake Changes), the rollback is very fast as in most cases there is nothing to do.
 
 Kill Idle Transactions
 ----------------------
@@ -30,7 +30,7 @@
 Block Startup until LRU dump is loaded
 --------------------------------------
 
-Added a new boolean option, :variable:`innodb-blocking-buffer-pool-restore`, which is ``OFF`` by default. When set to ``ON``, restoring from the LRU dump file is synchronous, i.e. |XtraDB| waits until it is complete before reporting successful startup to the server. Bug Fixed: :bug:`785489` (*Alexey Kopytov*).
+Added a new boolean option, :variable:`innodb_blocking_buffer_pool_restore`, which is ``OFF`` by default. When set to ``ON``, restoring from the LRU dump file is synchronous, i.e. |XtraDB| waits until it is complete before reporting successful startup to the server. Bug Fixed: :bug:`785489` (*Alexey Kopytov*).
 
 Behavior changes
 ----------------