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

[Hrvoje Matijakovic]

[Stewart Smith (stewart)]

review: Approve

=== modified file 'doc/source/installation/apt_repo.rst'
--- doc/source/installation/apt_repo.rst	2012-01-09 04:33:49 +0000
+++ doc/source/installation/apt_repo.rst	2012-04-21 07:23:19 +0000
@@ -12,10 +12,10 @@
   
   $ gpg -a --export CD2EFD2A | sudo apt-key add -
 
-Add this to :file:`/etc/apt/sources.list`, replacing ``lenny`` with the name of your distribution: ::
+Add this to :file:`/etc/apt/sources.list`, replacing ``VERSION`` with the name of your distribution: ::
 
-  deb http://repo.percona.com/apt lenny main
-  deb-src http://repo.percona.com/apt lenny main
+  deb http://repo.percona.com/apt VERSION main
+  deb-src http://repo.percona.com/apt VERSION main
 
 Remember to update the local cache: ::
 
@@ -47,7 +47,7 @@
 Release Candidate Repository
 ============================
 
-To subscribe to the release candidate repository, add two lines to the :file:`/etc/apt/sources.list` file, again replacing ``lenny`` with your server's release version: ::
+To subscribe to the release candidate repository, add two lines to the :file:`/etc/apt/sources.list` file, again replacing ``VERSION`` with your server's release version: ::
 
-  deb http://repo.percona.com/apt-rc lenny main
-  deb-src http://repo.percona.com/apt-rc lenny main
+  deb http://repo.percona.com/apt-rc VERSION main
+  deb-src http://repo.percona.com/apt-rc VERSION main

=== modified file 'doc/source/management/innodb_lru_dump_restore.rst'
--- doc/source/management/innodb_lru_dump_restore.rst	2011-10-07 00:55:06 +0000
+++ doc/source/management/innodb_lru_dump_restore.rst	2012-04-21 07:23:19 +0000
@@ -102,20 +102,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.
 
 
-Version Specific Information
-============================
-
-  * 5.1.50-12.1:
-    Automatic dump/restore implemented.
-  * 5.5.10-20.1:
-    Renamed variable :variable:`innodb_auto_lru_dump` to :variable:`innodb_buffer_pool_restore_at_startup`.
-
 System Variables
 ================
 
 .. variable:: innodb_auto_lru_dump
 
-     :version 5.5.10-20.1: Renamed.
+     :version 1.0.6-9: Added.
      :cli: Yes
      :conf: Yes
      :scope: Global
@@ -127,24 +119,18 @@
 
 This variable specifies the time in seconds between automatic buffer pool dumps. When set to zero, automatic dumps are disabled and must be done manually. When set to a non-zero value, an automatic restore of the buffer pool is also performed at startup, as described above.
 
- 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_buffer_pool_restore_at_startup
-
-     :version 5.5.10-20.1: Added.
+.. variable:: innodb-blocking-lru-restore
+
+     :version 5.1.59-13.0: Added.
      :cli: Yes
      :conf: Yes
      :scope: Global
-     :dyn: Yes
-     :vartype: Numeric
-     :default: 0
-     :range: 0-UINT_MAX32
-     :unit:  Seconds
-
-This variable specifies the time in seconds between automatic buffer pool dumps. When set to zero, automatic dumps are disabled and must be done manually. When set to a non-zero value, an automatic restore of the buffer pool is also performed at startup, as described above.
-
- This variable was added in release 5.5.10-20.1. Prior to that, it was named :variable:`innodb_auto_lru_dump`, which still exists in earlier versions.
-
+     :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.
 
 Other reading
 =============