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

Proposed by Hrvoje Matijakovic
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 546
Proposed branch: lp:~hrvojem/percona-server/bug1154954-5.1
Merge into: lp:percona-server/5.1
Diff against target: 25 lines (+0/-5)
2 files modified
doc/source/management/innodb_kill_idle_trx.rst (+0/-2)
doc/source/performance/handlersocket.rst (+0/-3)
To merge this branch: bzr merge lp:~hrvojem/percona-server/bug1154954-5.1
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+156551@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc/source/management/innodb_kill_idle_trx.rst'
--- doc/source/management/innodb_kill_idle_trx.rst 2011-10-17 00:06:22 +0000
+++ doc/source/management/innodb_kill_idle_trx.rst 2013-04-02 13:17:34 +0000
@@ -4,8 +4,6 @@
4 Kill Idle Transactions4 Kill Idle Transactions
5========================5========================
66
7**NOTE:** This feature is currently considered **BETA** quality and may not yet be suitable for use in production environments.
8
9This feature limits the age of idle |XtraDB| transactions. If a transaction is idle for more seconds than the threshold specified, it will be killed. This prevents users from blocking purge by mistake.7This feature limits the age of idle |XtraDB| transactions. If a transaction is idle for more seconds than the threshold specified, it will be killed. This prevents users from blocking purge by mistake.
108
11System Variables9System Variables
1210
=== modified file 'doc/source/performance/handlersocket.rst'
--- doc/source/performance/handlersocket.rst 2012-12-13 12:31:02 +0000
+++ doc/source/performance/handlersocket.rst 2013-04-02 13:17:34 +0000
@@ -13,9 +13,6 @@
1313
14The plugin is disabled by default. To enable it in |Percona Server| with |XtraDB|, see below.14The plugin is disabled by default. To enable it in |Percona Server| with |XtraDB|, see below.
1515
16**Please be aware that this is currently an experimental feature, and use it as such.**
17
18
19Version Specific Information16Version Specific Information
20============================17============================
2118

Subscribers

People subscribed via source and target branches