Merge lp:~hrvojem/percona-server/bug1031410-5.5 into lp:percona-server/5.5

[Hrvoje Matijakovic]

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'doc/source/diagnostics/slow_extended_55.rst'
--- doc/source/diagnostics/slow_extended_55.rst	2012-06-19 13:40:59 +0000
+++ doc/source/diagnostics/slow_extended_55.rst	2012-08-03 09:12:26 +0000
@@ -93,9 +93,9 @@
 Logging all queries might consume I/O bandwidth and cause the log file to grow large.
  * When :variable:`log_slow_rate_type` is ``session``, this option lets you log full sessions, so you have complete records of sessions for later analysis; but you can rate-limit the number of sessions that are logged. Note that this feature will not work well if your application uses any type of connection pooling or persistent connections. Note that you change :variable:`log_slow_rate_limit` in ``session`` mode, you should reconnect for get effect.
 
- * When :variable:`log_slow_rate_type` is ``query``, this option lets you log just some queries for later analysis. For example, if you set the value to 100, then one percona of queryies will logged.
+ * When :variable:`log_slow_rate_type` is ``query``, this option lets you log just some queries for later analysis. For example, if you set the value to 100, then one percent of queries will be logged.
 
-Note that every query has global unique ``query_id`` and every connection can has it own (session) :variable:``log_slow_rate_limit``.
+Note that every query has global unique ``query_id`` and every connection can has it own (session) :variable:`log_slow_rate_limit`.
 Decision "log or no" calculated in following manner:
 
  * if ``log_slow_rate_limit`` is 0 - log every query
@@ -113,7 +113,7 @@
      :scope: Global, session
      :dyn: Yes (in 5.1 releases only)
 
-Specifies that queries replayed by the slave SQL thread on a |MySQL| slave will be logged. The standard |MySQL| server will not log any queries executed by the slave``s SQL thread.
+Specifies that queries replayed by the slave SQL thread on a |MySQL| slave will be logged. The standard |MySQL| server will not log any queries executed by the slave's SQL thread.
 
 To start the logging from the slave thread, you should change the global value: set global :variable:`log_slow_slave_statements` ``=ON``; and then execute: ``STOP SLAVE; START SLAVE;``. This will destroy and recreate the slave SQL thread, so it will see the newly set global value.
 
@@ -223,7 +223,7 @@
      :default: None
      :version 5.5.10-20.1: Introduced (renamed from :variable:`log_slow_timestamp_every`)
 
-Specifies which variables have global scope instead of local. Value is a “flag” variable - you can specify multiple values separated by commas
+Specifies which variables have global scope instead of local. Value is a "flag" variable - you can specify multiple values separated by commas
 
   * ``none``:
     All variables use local scope

=== modified file 'doc/source/reliability/innodb_corrupt_table_action.rst'
--- doc/source/reliability/innodb_corrupt_table_action.rst	2012-05-21 12:56:39 +0000
+++ doc/source/reliability/innodb_corrupt_table_action.rst	2012-08-03 09:12:26 +0000
@@ -45,6 +45,6 @@
      :default: ``assert``
      :range: ``assert``, ``warn``
 
-Pass corruptions of user tables as ``corrupt table`` instead of not crashing itself, when used with file_per_table. All file I/O for the datafile after detected as corrupt is disabled, except for the deletion.
+When the default value is used InnoDB will stop the server if it finds a checksum mismatch on the tables. If ``warn`` values is used it will pass corruption of the table as ``corrupt table`` instead of crashing itself. For this to work :option:`innodb_file_per_table` should be enabled. All file I/O for the datafile after detected as corrupt is disabled, except for the deletion.
 
  This variable was added in release 5.5.10-20.1. Prior to that, it was named :variable:`innodb_pass_corrupt_table`, which still exists in earlier versions.

=== modified file 'doc/source/scalability/innodb_insert_buffer.rst'
--- doc/source/scalability/innodb_insert_buffer.rst	2012-05-21 12:56:39 +0000
+++ doc/source/scalability/innodb_insert_buffer.rst	2012-08-03 09:12:26 +0000
@@ -38,11 +38,11 @@
    :default: 100
    :range: 100 - 999999999
 
-This variable allows better control of the background thread processing the insert buffer. Each time the thread is called, its activity is altered by the value of both ``innodb_io_capacity`` and ``innodb_ibuf_merge_rate`` this way: ::
-
-  [real activity] = [default activity] * (innodb_io_capacity/100) * (innodb_ibuf_merge_rate/100)
-
-By increasing the value of ``innodb_ibuf_merge_rate``, you will increase the insert buffer activity.
+This variable allows better control of the background thread processing the insert buffer. Each time the thread is called, its activity is altered by the value of both ``innodb_io_capacity`` and ``innodb_ibuf_accel_rate`` this way: ::
+
+  [real activity] = [default activity] * (innodb_io_capacity/100) * (innodb_ibuf_accel_rate/100)
+
+By increasing the value of :variable:`innodb_ibuf_accel_rate`, you will increase the insert buffer activity.
 
 .. variable:: innodb_ibuf_max_size