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

[Hrvoje Matijakovic]

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== 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 @@
 
     * Added column ``TIME_MS`` to table ``PROCESSLIST``.
 
+  * :rn:`5.6.11-60.3`:
+
+    * Added ``ROWS_SENT`` and ``ROWS_EXAMINED`` columns to table ``PROCESSLIST``.`
 
 INFORMATION_SCHEMA Tables
 =========================
@@ -36,6 +39,8 @@
    :column STATE: An action, event, or state that indicates what the thread is doing.
    :column INFO: The statement that the thread is executing, or NULL if it is not executing any statement.
    :column TIME_MS: The time in milliseconds that the thread has been in its current state.
+   :column ROWS_SENT: The number of rows query sent.
+   :column ROWS_EXAMINED: The number of rows scanned for a query.
 
 
 Example Output
@@ -45,9 +50,9 @@
 
   mysql> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 
-  +----+------+-----------+--------------------+---------+------+-----------+----------------------------------------------+---------+
-  | ID | USER | HOST      | DB                 | COMMAND | TIME | STATE     | INFO                                         | TIME_MS |
-  +----+------+-----------+--------------------+---------+------+-----------+----------------------------------------------+---------+
-  |  5 | root | localhost | information_schema | Query   |    0 | executing | select * from information_schema.PROCESSLIST |       0 |
-  +----+------+-----------+--------------------+---------+------+-----------+----------------------------------------------+---------+
- 
+  +----+------+-----------+--------------------+---------+------+-----------+---------------------------+---------+-----------+---------------+
+  | ID | USER | HOST      | DB                 | COMMAND | TIME | STATE     | INFO                      | TIME_MS | ROWS_SENT | ROWS_EXAMINED |
+  +----+------+-----------+--------------------+---------+------+-----------+---------------------------+---------+-----------+---------------+
+  | 12 | root | localhost | information_schema | Query   |    0 | executing | select * from processlist |       0 |         0 |             0 |
+  +----+------+-----------+--------------------+---------+------+-----------+---------------------------+---------+-----------+---------------+
+
 
=== 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 @@
 
   * Ignoring comments
 
-Disabling the cache completely
-==============================
-
-This 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.
-
-The query cache can now be disabled at server startup or in an option file by: ::
-
-  --query_cache_type=0
-
-The default is 1 (query cache enabled).
-
-**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.
-
-If query caching is off and a user tries to turn it on from within a session, the following error will be reported: ::
-
-  SET GLOBAL query_cache_type=ON;
-  ERROR 1651(HY000): Query cache is disabled; restart the server with query_cache_type=1 to enable it
-
-**Note:** This variable is implemented in standard |MySQL| from version 5.5.0.
-
-
 Diagnosing contention more easily
 =================================