Merge lp:~hrvojem/percona-server/bug1187324-5.6 into lp:percona-server/5.6

Proposed by Hrvoje Matijakovic
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 387
Merged at revision: 387
Proposed branch: lp:~hrvojem/percona-server/bug1187324-5.6
Merge into: lp:percona-server/5.6
Diff against target: 69 lines (+11/-27)
2 files modified
doc/source/diagnostics/process_list.rst (+11/-6)
doc/source/performance/query_cache_enhance.rst (+0/-21)
To merge this branch: bzr merge lp:~hrvojem/percona-server/bug1187324-5.6
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+170366@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc/source/diagnostics/process_list.rst'
--- doc/source/diagnostics/process_list.rst 2013-05-27 13:59:13 +0000
+++ doc/source/diagnostics/process_list.rst 2013-06-19 13:58:30 +0000
@@ -19,6 +19,9 @@
1919
20 * Added column ``TIME_MS`` to table ``PROCESSLIST``.20 * Added column ``TIME_MS`` to table ``PROCESSLIST``.
2121
22 * :rn:`5.6.11-60.3`:
23
24 * Added ``ROWS_SENT`` and ``ROWS_EXAMINED`` columns to table ``PROCESSLIST``.`
2225
23INFORMATION_SCHEMA Tables26INFORMATION_SCHEMA Tables
24=========================27=========================
@@ -36,6 +39,8 @@
36 :column STATE: An action, event, or state that indicates what the thread is doing.39 :column STATE: An action, event, or state that indicates what the thread is doing.
37 :column INFO: The statement that the thread is executing, or NULL if it is not executing any statement.40 :column INFO: The statement that the thread is executing, or NULL if it is not executing any statement.
38 :column TIME_MS: The time in milliseconds that the thread has been in its current state.41 :column TIME_MS: The time in milliseconds that the thread has been in its current state.
42 :column ROWS_SENT: The number of rows query sent.
43 :column ROWS_EXAMINED: The number of rows scanned for a query.
3944
4045
41Example Output46Example Output
@@ -45,9 +50,9 @@
4550
46 mysql> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;51 mysql> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
4752
48 +----+------+-----------+--------------------+---------+------+-----------+----------------------------------------------+---------+53 +----+------+-----------+--------------------+---------+------+-----------+---------------------------+---------+-----------+---------------+
49 | ID | USER | HOST | DB | COMMAND | TIME | STATE | INFO | TIME_MS |54 | ID | USER | HOST | DB | COMMAND | TIME | STATE | INFO | TIME_MS | ROWS_SENT | ROWS_EXAMINED |
50 +----+------+-----------+--------------------+---------+------+-----------+----------------------------------------------+---------+55 +----+------+-----------+--------------------+---------+------+-----------+---------------------------+---------+-----------+---------------+
51 | 5 | root | localhost | information_schema | Query | 0 | executing | select * from information_schema.PROCESSLIST | 0 |56 | 12 | root | localhost | information_schema | Query | 0 | executing | select * from processlist | 0 | 0 | 0 |
52 +----+------+-----------+--------------------+---------+------+-----------+----------------------------------------------+---------+57 +----+------+-----------+--------------------+---------+------+-----------+---------------------------+---------+-----------+---------------+
53 58
5459
=== modified file 'doc/source/performance/query_cache_enhance.rst'
--- doc/source/performance/query_cache_enhance.rst 2013-06-03 10:01:08 +0000
+++ doc/source/performance/query_cache_enhance.rst 2013-06-19 13:58:30 +0000
@@ -12,27 +12,6 @@
1212
13 * Ignoring comments13 * Ignoring comments
1414
15Disabling the cache completely
16==============================
17
18This feature allows the user to completely disable use of the query cache. When the server is compiled with the query cache enabled, the query cache is locked during use by the query cache mutex. This lock can cause performance to decrease in some situations. By disabling use of the query cache altogether when the server is started, any possibility of locking it is eliminated, and performance may be improved.
19
20The query cache can now be disabled at server startup or in an option file by: ::
21
22 --query_cache_type=0
23
24The default is 1 (query cache enabled).
25
26**Note:** This variable already exists in standard |MySQL|, but when setting query_cache_type=0, the query cache mutex will still be in used. Setting query_cache_type=0 in |Percona Server| ensures that both the cache is disabled and the mutex is not used.
27
28If query caching is off and a user tries to turn it on from within a session, the following error will be reported: ::
29
30 SET GLOBAL query_cache_type=ON;
31 ERROR 1651(HY000): Query cache is disabled; restart the server with query_cache_type=1 to enable it
32
33**Note:** This variable is implemented in standard |MySQL| from version 5.5.0.
34
35
36Diagnosing contention more easily15Diagnosing contention more easily
37=================================16=================================
3817

Subscribers

People subscribed via source and target branches