Merge lp:~hrvojem/percona-server/rn-5.5.24-26.0 into lp:percona-server/5.5

[Hrvoje Matijakovic]

[Stewart Smith (stewart)]

review approve
merge approve

--
Stewart Smith

[Stewart Smith (stewart)]

review: Approve

[Stewart Smith (stewart)]

 review approve
 merge approve

--
Stewart Smith

review: Approve

=== modified file 'doc/source/diagnostics/user_stats.rst'
--- doc/source/diagnostics/user_stats.rst	2012-01-25 14:53:47 +0000
+++ doc/source/diagnostics/user_stats.rst	2012-05-28 12:06:21 +0000
@@ -14,6 +14,8 @@
 
   * :rn:`5.5.10-20.1`:
      Renamed variable :variable:`userstat_running` to :variable:`userstat`.
+  * :rn:`5.5.24-26.0`:
+     TOTAL_CONNECTIONS_SSL column has been added to CLIENT_STATISTICS, THREAD_STATISTICS and USER_STATISTICS tables 
 
 Other Information
 =================
@@ -64,6 +66,8 @@
   :column LOST_CONNECTIONS: The number of this client's connections that were terminated uncleanly.
   :column ACCESS_DENIED: The number of times this client's connections issued commands that were denied.
   :column EMPTY_QUERIES: The number of times this client's connections sent empty queries to the server.
+  :column TOTAL_CONNECTIONS_SSL: The number of times this client's connections connected using SSL to the server.
+
 
 This table holds statistics about client connections. The Percona version of the feature restricts this table's visibility to users who have the ``SUPER`` or ``PROCESS`` privilege.
 
@@ -92,6 +96,7 @@
         LOST_CONNECTIONS: 0
            ACCESS_DENIED: 0
            EMPTY_QUERIES: 0
+   TOTAL_CONNECTIONS_SSL: 0
 
 
 .. table:: INFORMATION_SCHEMA.INDEX_STATISTICS
@@ -161,6 +166,7 @@
   :column LOST_CONNECTIONS: int(21)
   :column ACCESS_DENIED: int(21)
   :column EMPTY_QUERIES: int(21)
+  :column TOTAL_CONNECTIONS_SSL: int(21)
 
 .. table:: INFORMATION_SCHEMA.USER_STATISTICS
 
@@ -185,6 +191,7 @@
   :column LOST_CONNECTIONS: The number of this user's connections that were terminated uncleanly.
   :column ACCESS_DENIED: The number of times this user's connections issued commands that were denied.
   :column EMPTY_QUERIES: The number of times this user's connections sent empty queries to the server.
+  :column TOTAL_CONNECTIONS_SSL: The number of times this user's connections connected using SSL to the server.
 
 This table contains information about user activity. The |Percona| version of the patch restricts this table's visibility to users who have the ``SUPER`` or ``PROCESS`` privilege.
 
@@ -215,6 +222,8 @@
         LOST_CONNECTIONS: 0
            ACCESS_DENIED: 0
            EMPTY_QUERIES: 0
+   TOTAL_CONNECTIONS_SSL: 0
+
 
 Commands Provided
 =================

=== modified file 'doc/source/index.rst'
--- doc/source/index.rst	2012-05-21 12:56:39 +0000
+++ doc/source/index.rst	2012-05-28 12:06:21 +0000
@@ -122,6 +122,7 @@
    management/udf_maatkit
    management/innodb_fake_changes
    management/innodb_kill_idle_trx
+   management/enforce_engine
 
 Diagnostics Improvements
 ========================

=== added file 'doc/source/management/enforce_engine.rst'
--- doc/source/management/enforce_engine.rst	1970-01-01 00:00:00 +0000
+++ doc/source/management/enforce_engine.rst	2012-05-28 12:06:21 +0000
@@ -0,0 +1,36 @@
+.. _enforce_engine:
+
+========================
+Enforcing Storage Engine
+========================
+
+|Percona Server| has implemented variable which can be used for enforcing the use of a specific storage engine.
+
+When this variable is specified and a user tries to create a table using an explicit storage engine that is not the specified enforced engine, he will get either an error if the ``NO_ENGINE_SUBSTITUTION`` SQL mode is enabled or a warning if ``NO_ENGINE_SUBSTITUTION`` is disabled and the table will be created anyway using the enforced engine (this is consistent with the default |MySQL| way of creating the default storage engine if other engines aren't available unless ``NO_ENGINE_SUBSTITUTION`` is set).
+
+In case user tries to enable enforce_storage_engine with engine that isn't available, system will not start.
+
+Version Specific Information
+============================
+
+  * :rn:`5.5.24-26.0`
+    Variable :variable:`enforce_storage_engine` implemented.
+
+System Variables
+================
+
+.. variable:: enforce_storage_engine
+
+     :cli: No
+     :conf: Yes
+     :scope: Global
+     :dyn: No
+     :vartype: String
+     :default: NULL
+
+Example
+=======
+
+Adding following option to :term:`my.cnf` will start the server with InnoDB as enforced storage engine. ::  
+
+ enforce_storage_engine=InnoDB

=== added file 'doc/source/release-notes/Percona-Server-5.5.24-26.0.rst'
--- doc/source/release-notes/Percona-Server-5.5.24-26.0.rst	1970-01-01 00:00:00 +0000
+++ doc/source/release-notes/Percona-Server-5.5.24-26.0.rst	2012-05-28 12:06:21 +0000
@@ -0,0 +1,33 @@
+.. rn:: 5.5.24-26.0
+
+==============================
+ |Percona Server| 5.5.24-26.0
+==============================
+
+Percona is glad to announce the release of |Percona Server| 5.5.24-26.0 on June 1st, 2012 (Downloads are available `here <http://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-5.5.24-26.0/>`_ and from the `Percona Software Repositories <http://www.percona.com/docs/wiki/repositories:start>`_).
+
+Based on `MySQL 5.5.24 <http://dev.mysql.com/doc/refman/5.5/en/news-5-5-24.html>`_, including all the bug fixes in it, |Percona Server| 5.5.24-26.0 is now the current stable release in the 5.5 series. All of |Percona|'s software is open-source and free, all the details of the release can be found in the `5.5.24-26.0 milestone at Launchpad <https://launchpad.net/percona-server/+milestone/5.5.24-26.0>`_. 
+
+Features
+========
+
+  * Percona PAM authentication plugin has now been integrated into the |Percona Server|. 
+
+  * |Percona Server| has implemented variable :variable:`enforce_storage_engine` which can be used for enforcing the use of a specific storage engine. 
+ 
+  * New column, TOTAL_CONNECTIONS_SSL, has been added in the CLIENT_STATISTICS, THREAD_STATISTICS and USER_STATISTICS tables in the INFORMATION_SCHEMA database.
+
+Bug Fixes
+=========
+
+  * Loading LRU dump was preventing shutdown. Bug fixed :bug:`712055` (*George Ormond Lorch III*).
+
+  * A crash could leave behind an InnoDB temporary table with temporary indexes resulting in an unbootable server. Bug fixed :bug:`999147` (*Laurynas Biveinis*).
+
+  * Since the output file is simply overwritten when dumping the LRU list, we could end up with a partially written dump file in case of a crash, or when making a backup copy of it. Safer approach has been implemente. It now dumps to a temporary file first, and then rename it to the actual dump file. Bug fixed :bug:`686392` (*George Ormond Lorch III*).
+
+  * LRU messages are now more verbose for LRU dump. Bug fixed :bug:`713481` (*George Ormond Lorch III*).
+
+  * Building Percona Server with the Clang compiler resulted in a compiler error. Bug fixed :bug:`997496` (*Alexey Kopytov*).
+
+  * Variable :variable:`thread_statistics` was a reserved word in Percona Server 5.5. As a result, the server variable with that name had to be quoted with backticks when used. Bug fixed :bug:`997036` (*Vladislav Lesin*).