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

[Hrvoje Matijakovic]

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'doc/source/management/super_read_only.rst'
--- doc/source/management/super_read_only.rst	2014-10-29 18:21:06 +0000
+++ doc/source/management/super_read_only.rst	2014-11-14 14:57:38 +0000
@@ -4,12 +4,12 @@
  ``super-read-only`` option 
 ============================
 
-|Percona Server| has ported new option, :variable:`super_read_only` from *WebScaleSQL*, which is like the `read-only <http://dev.mysql.com/doc/refman/5.6/en/server-system-variables.html#sysvar_read_only>`_ option, but affecting users with ``SUPER`` privileges as well. Enabling :variable:`super_read_only` implies regular ``read-only`` as well.
+|Percona Server| has ported a new option, :variable:`super_read_only` from *WebScaleSQL*, which is like the `read-only <http://dev.mysql.com/doc/refman/5.6/en/server-system-variables.html#sysvar_read_only>`_ option, but affecting users with ``SUPER`` privileges as well. Enabling :variable:`super_read_only` implies regular ``read-only`` as well.
 
 Interaction with :variable:`read_only` variable:
 
  * Turning :variable:`read_only` off also turns off :variable:`super_read_only`.
- * Turning :variable:`super_read_only` on also turns :variable:`read_only`` on.
+ * Turning :variable:`super_read_only` on also turns :variable:`read_only` on.
  * All other changes to either one of these have no affect on the other.
 
 System Variables
 
=== modified file 'doc/source/performance/innodb_numa_support.rst'
--- doc/source/performance/innodb_numa_support.rst	2013-09-27 11:57:54 +0000
+++ doc/source/performance/innodb_numa_support.rst	2014-11-14 14:57:38 +0000
@@ -4,7 +4,7 @@
  Improved ``NUMA`` support
 ===========================
 
-In cases where the buffer pool memory allocation was bigger than size of the node, system would start swapping already allocated memory even if there is available memory on other node. This is would happen if the default :term:`NUMA` memory allocation policy was selected. In that case system would favor one node more than other which caused the node to run out of memory. Changing the allocation policy to interleaving, memory will be allocated in round-robing fashion over the available node. This can be done by using the mysqld_safe :variable:`numa_interleave` option.
+In cases where the buffer pool memory allocation was bigger than size of the node, system would start swapping already allocated memory even if there is available memory on other node. This is would happen if the default :term:`NUMA` memory allocation policy was selected. In that case system would favor one node more than other which caused the node to run out of memory. Changing the allocation policy to interleaving, memory will be allocated in round-robin fashion over the available node. This can be done by using the mysqld_safe :variable:`numa_interleave` option.
 
 Another improvement implemented is preallocating the pages in the buffer pool on startup with :variable:`innodb_buffer_pool_populate` variable. This forces ``NUMA`` allocation decisions to be made immediately while the buffer cache is clean.
 
@@ -22,7 +22,7 @@
 .. variable:: innodb_buffer_pool_populate
 
      :cli: Yes
-     :conf: No
+     :conf: Yes
      :location: mysqld
      :scope: Global
      :dyn: No
@@ -32,12 +32,12 @@
 
 When this variable is enabled, |InnoDB| preallocates pages in the buffer pool on startup to force ``NUMA`` allocation decisions to be made immediately while the buffer cache is clean.
 
-Command-line Options
-=====================
+Command-line Options for mysqld_safe
+====================================
 
 .. variable:: flush_caches
 
-     :cli: No
+     :cli: Yes
      :conf: Yes
      :location: mysqld_safe
      :dyn: No
@@ -49,7 +49,7 @@
 
 .. variable:: numa_interleave
 
-     :cli: No
+     :cli: Yes
      :conf: Yes
      :location: mysqld_safe
      :dyn: No