Merge lp:~hrvojem/percona-server/bug997469-5.1 into lp:percona-server/5.1

[Hrvoje Matijakovic]

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'doc/source/diagnostics/innodb_stats.rst'
--- doc/source/diagnostics/innodb_stats.rst	2012-01-31 13:43:08 +0000
+++ doc/source/diagnostics/innodb_stats.rst	2012-05-29 20:17:23 +0000
@@ -54,13 +54,12 @@
 
 .. variable:: innodb_use_sys_stats_table
 
+   :version: 5.1.49-11.3 Variable introduced
    :type: BOOLEAN
    :default: 0
 
 
-If this option is enabled, |XtraDB| uses the ``SYS_STATS`` system table to store statistics of table indexes. Also, when |InnoDB| opens a table for the first time, it loads the statistics from ``SYS_STATS`` instead of sampling index pages. If you use a high ``stats_sample_pages`` value, the first open of a table is expensive. In such a case, this option will help. Note: This option may cause less frequent updating of statistics. So, you should intentionally use the ``ANALYZE TABLE`` command more often.
-
-(This variable was introduced in release 5.1.49-rel11.3)
+If this option is enabled, |XtraDB| uses the ``SYS_STATS`` system table to store statistics of table indexes. Also, when |InnoDB| opens a table for the first time, it loads the statistics from ``SYS_STATS`` instead of sampling index pages. If you use a high ``stats_sample_pages`` value, the first open of a table is expensive. In such a case, this option will help. Intended behavior is to never update statistics unless an explicit ``ANALYZE TABLE`` is issued.
 
 
 INFORMATION_SCHEMA Tables
 
=== modified file 'doc/source/diagnostics/mysql_syslog.rst'
--- doc/source/diagnostics/mysql_syslog.rst	2011-10-07 00:55:06 +0000
+++ doc/source/diagnostics/mysql_syslog.rst	2012-05-29 20:17:23 +0000
@@ -4,7 +4,7 @@
  Log All Client Commands (``syslog``)
 ======================================
 
-When enabled, this feature causes all commands run on the client to be logged to ``syslog``.
+When enabled, this feature causes all commands run by the command line client to be logged to ``syslog``. If you want to enable this option permanently, add it to the [mysql] group in my.cnf.
 
 
 Version Specific Information
 
=== modified file 'doc/source/diagnostics/slow_extended.rst'
--- doc/source/diagnostics/slow_extended.rst	2011-10-07 00:55:06 +0000
+++ doc/source/diagnostics/slow_extended.rst	2012-05-29 20:17:23 +0000
@@ -179,10 +179,10 @@
 Specifies the time threshold for filtering queries out of the slow query log. The unit of time is seconds. This option has the same meaning as in a standard |MySQL| server, with the following changes:
 
 The option accepts fractional values. If set to 0.5, for example, queries longer than 1/2 second will be logged.
-
-If the value is set to 0, then all queries are logged. This is different from the standard |MySQL| build, where a value of 0 disables logging.
 Before version 1.01 of this feature, the value was an integer, and the unit of time was microseconds, not seconds.
 
+If the value is set to 0, then all queries are logged. This is different from the standard |MySQL| build, prior to version 5.1.21, where a value of 0 disables logging. After |MySQL| 5.1.21 this has been changed to minimum value and you can disable/enable slow query log with ``slow_query_log`` variable.
+
 .. variable:: profiling_server
 
      :cli: Yes
 
=== modified file 'doc/source/installation/apt_repo.rst'
--- doc/source/installation/apt_repo.rst	2012-05-17 11:21:21 +0000
+++ doc/source/installation/apt_repo.rst	2012-05-29 20:17:23 +0000
@@ -50,3 +50,15 @@
 
   deb http://repo.percona.com/apt-rc VERSION main
   deb-src http://repo.percona.com/apt-rc VERSION main
+
+
+Apt-Pinning the packages
+========================
+
+In some cases you might need to "pin" the selected packages to avoid the upgrades from the distribution repositories. You'll need to make a new file :file:`/etc/apt/preferences.d/00percona.pref` and add the following lines in it: :: 
+
+  Package: *
+  Pin: release o=Percona Development Team
+  Pin-Priority: 1001
+
+For more information about the pinning you can check the official `debian wiki <http://wiki.debian.org/AptPreferences>`_.
 
=== modified file 'doc/source/reliability/innodb_corrupt_table_action.rst'
--- doc/source/reliability/innodb_corrupt_table_action.rst	2011-10-07 00:55:06 +0000
+++ doc/source/reliability/innodb_corrupt_table_action.rst	2012-05-29 20:17:23 +0000
@@ -8,18 +8,12 @@
 
 This feature adds a new system variable.
 
-Version Specific Information
-============================
-
-  * 5.5.10-20.1:
-    Renamed variable :variable:`innodb_pass_corrupt_table` to :variable:`innodb_corrupt_table_action`.
 
 System Variables
 ================
 
 .. variable:: innodb_pass_corrupt_table
 
-     :version 5.5.10-20.1: Renamed.
      :cli: Yes
      :conf: Yes
      :scope: Global
@@ -31,20 +25,3 @@
 
 Pass corruptions of user tables as ``corrupt table`` instead of crashing itself, when used with innodb_file_per_table. All file I/O for the datafile after detected as corrupt is disabled, except for the deletion.
 
- This variable was renamed to innodb_corrupt_table_action, beginning in release 5.5.10-20.1. It still exists as :variable:`innodb_pass_corrupt_table` in versions prior to that.
-
-
-.. variable:: innodb_corrupt_table_action
-
-     :version 5.5.10-20.1: Introduced.
-     :cli: Yes
-     :conf: Yes
-     :scope: Global
-     :dyn: Yes
-     :vartype: ULONG
-     :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.
-
- 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_extra_rseg.rst'
--- doc/source/scalability/innodb_extra_rseg.rst	2011-10-07 00:55:06 +0000
+++ doc/source/scalability/innodb_extra_rseg.rst	2012-05-29 20:17:23 +0000
@@ -32,6 +32,8 @@
 
 When you modify this variable, you must restart the |MySQL| server for the change to take effect. Please note that you must perform a slow shutdown (ie with ``innodb_fast_shutdown = 0``). If you just perform a fast shutdown, the |MySQL| server will then restart without error but the additional segments will not be created.
 
+If there is already any existing data stored in |XtraDB| or |InnoDB| it will need to be dumped and re-imported once this option has been enabled. This is needed so |XtraDB| can re-create the new data files with additional rollback segments.
+
 To check that the extra segments have been created, you can run the following query: ::
 
   SELECT COUNT(*) FROM information_schema.INNODB_RSEG;