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

Proposed by Hrvoje Matijakovic on 2012-03-16
Status: Merged
Approved by: Stewart Smith on 2012-03-17
Approved revision: 223
Merged at revision: 223
Proposed branch: lp:~hrvojem/percona-server/bug953304-5.5
Merge into: lp:percona-server/5.5
Diff against target: 18 lines (+2/-2)
1 file modified
doc/source/management/innodb_lru_dump_restore.rst (+2/-2)
To merge this branch: bzr merge lp:~hrvojem/percona-server/bug953304-5.5
Reviewer Review Type Date Requested Status
Stewart Smith (community) 2012-03-16 Approve on 2012-03-17
Review via email: mp+97834@code.launchpad.net
To post a comment you must log in.
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/source/management/innodb_lru_dump_restore.rst'
2--- doc/source/management/innodb_lru_dump_restore.rst 2012-02-13 08:49:21 +0000
3+++ doc/source/management/innodb_lru_dump_restore.rst 2012-03-16 10:45:22 +0000
4@@ -141,7 +141,7 @@
5 :range: 0-UINT_MAX32
6 :unit: Seconds
7
8-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.
9+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. The variable :variable:`innodb_buffer_pool_restore_at_startup` controls both automatic buffer pool dumps and automatic restore on startup. When set to a non-zero value, an automatic restore of the buffer pool is also performed at startup, as described above.
10
11 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.
12
13@@ -149,4 +149,4 @@
14 Other reading
15 =============
16
17- * `Save / restore buffer pool <http://www.|MySQL|performanceblog.com/2010/01/20/|XtraDB|-feature-save-restore-buffer-pool/>`_
18+ * `Save / restore buffer pool <http://www.mysqlperformanceblog.com/2010/01/20/xtradb-feature-save-restore-buffer-pool/>`_

Subscribers

People subscribed via source and target branches