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

[Hrvoje Matijakovic]

[Alexey Kopytov (akopytov)]

Hm, I don't see fixes for Bug #1154954 and Bug #1154957 in the diff?

review: Needs Fixing

[Alexey Kopytov (akopytov)]

Bug #1154954 and Bug #1154957 are not applicable to 5.6. Was just confused with a reference in revision comments.

review: Approve

=== added file 'doc/source/performance/threadpool.rst'
--- doc/source/performance/threadpool.rst	1970-01-01 00:00:00 +0000
+++ doc/source/performance/threadpool.rst	2013-04-02 13:14:23 +0000
@@ -0,0 +1,113 @@
+.. _threadpool:
+
+=============
+ Thread Pool
+=============
+
+.. note::
+
+ This feature implementation is considered BETA quality.
+
+|MySQL| executes statements using one thread per client connection. Once the number of connections increases past a certain point performance will degrade. 
+
+This feature enables the server to keep the top performance even with large number of client connections by introducing a dynamic thread pool. By using the thread pool server would decrease the number of threads, which will then reduce the context switching and hot locks contentions. Using the thread pool will have the most effect with ``OLTP`` workloads (relatively short CPU-bound queries). 
+
+In order to enable the thread pool variable :variable:`thread_handling` should be set up to ``pool-of-threads`` value. This can be done by adding: ::
+
+ thread_handling=pool-of-threads
+
+to the |MySQL| configuration file :file:`my.cnf`.
+
+Although the default values for the thread pool should provide good performance, additional `tuning <https://kb.askmonty.org/en/threadpool-in-55/#optimizing-server-variables-on-unix>`_ can be performed with the dynamic system variables described below. 
+
+.. note:: 
+ 
+  Current implementation of the thread pool is built in the server, unlike the upstream version which is implemented as a plugin. Another significant implementation difference is that this implementation doesn't try to minimize the number of concurrent transactions like the ``MySQL Enterprise Threadpool``. Because of these things this implementation isn't compatible with the upstream one.
+
+Version Specific Information
+============================
+
+ * :rn:`5.6.10-60.2`
+    ``Thread Pool`` feature implemented. This feature was ported from |MariaDB|.
+
+System Variables
+================
+
+.. variable:: thread_pool_idle_timeout
+
+     :cli: Yes
+     :conf: Yes
+     :scope: Global
+     :dyn: Yes
+     :vartype: Numeric
+     :default: 60 (seconds)
+
+This variable can be used to limit the time an idle thread should wait before exiting.
+
+.. variable:: thread_pool_max_threads
+
+     :cli: Yes
+     :conf: Yes
+     :scope: Global
+     :dyn: Yes
+     :vartype: Numeric
+     :default: 500
+
+This variable can be used to limit the maximum number of threads in the pool. Once this number is reached no new threads will be created.
+
+.. variable:: thread_pool_oversubscribe
+
+     :cli: Yes
+     :conf: Yes
+     :scope: Global
+     :dyn: Yes
+     :vartype: Numeric
+     :default: 3
+
+The higher the value of this parameter the more threads can be run at the same time, if the values is lower than ``3`` it could lead to more sleeps and wake-ups.
+
+.. variable:: thread_pool_size
+
+     :cli: Yes
+     :conf: Yes
+     :scope: Global
+     :dyn: Yes
+     :vartype: Numeric
+     :default: Number of processors
+
+This variable can be used to define the number of threads that can use the CPU at the same time.
+
+.. variable:: thread_pool_stall_limit
+
+     :cli: Yes
+     :conf: Yes
+     :scope: Global
+     :dyn: No
+     :vartype: Numeric
+     :default: 500 (ms)
+
+The number of milliseconds before a running thread is considered stalled. When this limit is reached thread pool will wake up or create another thread. This is being used to prevent a long-running query from monopolizing the pool.
+
+Status Variables
+=====================
+
+.. variable:: Threadpool_idle_threads
+
+     :cli: Yes
+     :vartype: Numeric
+
+This status variable shows the number of idle threads in the pool.
+
+.. variable:: Threadpool_threads
+
+     :cli: Yes
+     :vartype: Numeric
+
+This status variable shows the number of threads in the pool.
+
+Other Reading
+=============
+
+ * `Thread pool in MariaDB 5.5  <https://kb.askmonty.org/en/threadpool-in-55/>`_
+
+ * `Thread pool implementation in Oracle MySQL <http://mikaelronstrom.blogspot.com/2011_10_01_archive.html>`_

=== removed file 'doc/source/performance/threadpool.rst'
--- doc/source/performance/threadpool.rst	2013-03-08 14:29:35 +0000
+++ doc/source/performance/threadpool.rst	1970-01-01 00:00:00 +0000
@@ -1,113 +0,0 @@
-.. _threadpool:
-
-=============
- Thread Pool
-=============
-
-.. note::
-
- This feature implementation is considered BETA quality.
-
-|MySQL| executes statements using one thread per client connection. Once the number of connections increases past a certain point performance will degrade. 
-
-This feature enables the server to keep the top performance even with large number of client connections by introducing a dynamic thread pool. By using the thread pool server would decrease the number of threads, which will then reduce the context switching and hot locks contentions. Using the thread pool will have the most effect with ``OLTP`` workloads (relatively short CPU-bound queries). 
-
-In order to enable the thread pool variable :variable:`thread_handling` should be set up to ``pool-of-threads`` value. This can be done by adding: ::
-
- thread_handling=pool-of-threads
-
-to the |MySQL| configuration file :file:`my.cnf`.
-
-Although the default values for the thread pool should provide good performance, additional `tuning <https://kb.askmonty.org/en/threadpool-in-55/#optimizing-server-variables-on-unix>`_ can be performed with the dynamic system variables described below. 
-
-.. note:: 
- 
-  Current implementation of the thread pool is built in the server, unlike the upstream version which is implemented as a plugin. Another significant implementation difference is that this implementation doesn't try to minimize the number of concurrent transactions like the ``MySQL Enterprise Threadpool``. Because of these things this implementation isn't compatible with the upstream one.
-
-Version Specific Information
-============================
-
- * :rn:`5.6.10-60.2`
-    ``Thread Pool`` feature implemented. This feature was ported from |MariaDB|.
-
-System Variables
-================
-
-.. variable:: thread_pool_idle_timeout
-
-     :cli: Yes
-     :conf: Yes
-     :scope: Global
-     :dyn: Yes
-     :vartype: Numeric
-     :default: 60 (seconds)
-
-This variable can be used to limit the time an idle thread should wait before exiting.
-
-.. variable:: thread_pool_max_threads
-
-     :cli: Yes
-     :conf: Yes
-     :scope: Global
-     :dyn: Yes
-     :vartype: Numeric
-     :default: 500
-
-This variable can be used to limit the maximum number of threads in the pool. Once this number is reached no new threads will be created.
-
-.. variable:: thread_pool_oversubscribe
-
-     :cli: Yes
-     :conf: Yes
-     :scope: Global
-     :dyn: Yes
-     :vartype: Numeric
-     :default: 3
-
-The higher the value of this parameter the more threads can be run at the same time, if the values is lower than ``3`` it could lead to more sleeps and wake-ups.
-
-.. variable:: thread_pool_size
-
-     :cli: Yes
-     :conf: Yes
-     :scope: Global
-     :dyn: Yes
-     :vartype: Numeric
-     :default: Number of processors
-
-This variable can be used to define the number of threads that can use the CPU at the same time.
-
-.. variable:: thread_pool_stall_limit
-
-     :cli: Yes
-     :conf: No
-     :scope: Global
-     :dyn: No
-     :vartype: Numeric
-     :default: 500 (ms)
-
-The number of milliseconds before a running thread is considered stalled. When this limit is reached thread pool will wake up or create another thread. This is being used to prevent a long-running query from monopolizing the pool.
-
-Status Variables
-=====================
-
-.. variable:: Threadpool_idle_threads
-
-     :cli: Yes
-     :vartype: Numeric
-
-This status variable shows the number of idle threads in the pool.
-
-.. variable:: Threadpool_threads
-
-     :cli: Yes
-     :vartype: Numeric
-
-This status variable shows the number of threads in the pool.
-
-Other Reading
-=============
-
- * `Thread pool in MariaDB 5.5  <https://kb.askmonty.org/en/threadpool-in-55/>`_
-
- * `Thread pool implementation in Oracle MySQL <http://mikaelronstrom.blogspot.com/2011_10_01_archive.html>`_