Merge lp:~hrvojem/percona-server/rn-5.5.37-35.1-5.6 into lp:percona-server/5.6

[Hrvoje Matijakovic]

[Laurynas Biveinis (laurynas-biveinis)]

review: Needs Fixing

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'doc/source/conf.py'
--- doc/source/conf.py	2014-05-06 12:43:39 +0000
+++ doc/source/conf.py	2014-05-30 13:33:18 +0000
@@ -118,8 +118,6 @@
 
 .. |MySQL|  replace:: *MySQL*
 
-.. |Drizzle|  replace:: *Drizzle*
-
 .. |MariaDB|  replace:: *MariaDB*
 
 .. |tar4ibd|  replace:: :program:`tar4ibd`

=== modified file 'doc/source/development.rst'
--- doc/source/development.rst	2013-05-27 13:59:13 +0000
+++ doc/source/development.rst	2014-05-30 13:33:18 +0000
@@ -8,12 +8,10 @@
 
 Submitting Changes
 ==================
-This process is very much modeled on what is being used by
-`Drizzle <http://www.drizzle.org>`_. The Drizzle project went through
-several iterations and refinements before settling on this process. It
-has been found to both keep trunk in a constant state of stability
-(allowing for a release at any time) and minimizing wasted time by
-developers due to broken code from somebody else interfering with their day.
+
+We keep trunk in a constant state of stability to allow for a release at 
+any time and to minimize wasted time by developers due to broken code 
+from somebody else interfering with their day.
 
 You should also be familiar with our |Jenkins| setup.
 

=== modified file 'doc/source/glossary.rst'
--- doc/source/glossary.rst	2013-05-27 13:59:13 +0000
+++ doc/source/glossary.rst	2014-05-30 13:33:18 +0000
@@ -18,24 +18,6 @@
     Consistency means that each transaction that modifies the database
     takes it from one consistent state to another.
 
-  Drizzle
-    Drizzle: a database for the cloud.
-
-    `Drizzle <http://www.drizzle.org/>`_ is a community-driven open source project that is forked
-    from the popular MySQL database. The Drizzle team has removed
-    non-essential code, re-factored the remaining code into a
-    plugin-based architecture and modernized the code base moving to
-    C++.
-
-  Drizzle Charter
-     * A database optimized for Cloud infrastructure and Web applications.
-     * Design for massive concurrency on modern multi-cpu architecture
-     * Optimize memory for increased performance and parallelism
-     * Open source, open community, open design Scope
-     * Re-designed modular architecture providing plugins with defined APIs
-     * Simple design for ease of use and administration
-     * Reliable, ACID transactional
-
   Durability
     Once a transaction is committed, it will remain so.
 
@@ -50,11 +32,10 @@
 
   InnoDB
     A :term:`Storage Engine` for MySQL and derivatives (:term:`Percona
-    Server`, :term:`MariaDB`, :term:`Drizzle`) originally written by
-    Innobase Oy, since acquired by Oracle. It provides :term:`ACID`
-    compliant storage engine with :term:`foreign key` support. As of
-    :term:`MySQL` version 5.5, InnoDB became the default storage engine
-    on all platforms.
+    Server`, :term:`MariaDB`) originally written by Innobase Oy, since 
+    acquired by Oracle. It provides :term:`ACID` compliant storage engine
+    with :term:`foreign key` support. As of :term:`MySQL` version 5.5, 
+    InnoDB became the default storage engine on all platforms.
 
   Jenkins
     `Jenkins <http://www.jenkins-ci.org>`_ is a continuous integration

=== modified file 'doc/source/installation/apt_repo.rst'
--- doc/source/installation/apt_repo.rst	2014-05-06 12:43:39 +0000
+++ doc/source/installation/apt_repo.rst	2014-05-30 13:33:18 +0000
@@ -37,7 +37,6 @@
 
  * 10.04LTS (lucid)
  * 12.04LTS (precise)
- * 13.04 (raring)
  * 13.10 (saucy)
  * 14.04LTS (trusty)
 

=== modified file 'doc/source/ps-versions-comparison.rst'
--- doc/source/ps-versions-comparison.rst	2014-04-25 10:55:01 +0000
+++ doc/source/ps-versions-comparison.rst	2014-05-30 13:33:18 +0000
@@ -71,8 +71,8 @@
      - :ref:`Handle BLOB End of Line <ps55:mysql_remove_eol_carret>`
      - Replaced by the upstream implementation [#n-9]_
    * - :ref:`Ability to change database for mysqlbinlog <ps51:mysqlbinlog_change_db>` 
-     - Feature not implemented
-     - Feature not implemented
+     - :ref:`Ability to change database for mysqlbinlog <ps55:mysqlbinlog_change_db>`
+     - :ref:`Ability to change database for mysqlbinlog <ps56:mysqlbinlog_change_db>`
    * - :ref:`Replication Stop Recovery <ps51:replication_skip_single_statement>`
      - Feature not implemented
      - Feature not implemented
@@ -208,6 +208,21 @@
    * - Feature not implemented
      - Feature not implemented
      - :ref:`Per-query variable statement <ps56:per_query_variable_statement>`
+   * - Feature not implemented
+     - :ref:`Extended mysqlbinlog <ps55:extended_mysqlbinlog>`
+     - :ref:`Extended mysqlbinlog <ps56:extended_mysqlbinlog>`
+   * - Feature not implemented
+     - :ref:`Slow Query Log Rotation and Expiration <ps55:slowlog_rotation>`
+     - :ref:`Slow Query Log Rotation and Expiration <ps56:slowlog_rotation>`
+   * - Feature not implemented
+     - :ref:`Metrics for scalability measurement <ps55:scalability_metrics_plugin>`
+     - :ref:`Metrics for scalability measurement <ps56:scalability_metrics_plugin>`
+   * - Feature not implemented
+     - :ref:`Audit Log <ps55:audit_log_plugin>`
+     - :ref:`Audit Log <ps56:audit_log_plugin>`
+   * - Feature not implemented
+     - Feature not implemented
+     - :ref:`Backup Locks <ps56:backup_locks>`
    
 
 Other Reading

=== modified file 'doc/source/release-notes/Percona-Server-5.6.16-64.0.rst'
--- doc/source/release-notes/Percona-Server-5.6.16-64.0.rst	2014-03-10 15:05:00 +0000
+++ doc/source/release-notes/Percona-Server-5.6.16-64.0.rst	2014-05-30 13:33:18 +0000
@@ -66,4 +66,6 @@
 
  Performance schema autosizing heuristics have been updated to account for Percona Server-specific ``wait/synch/mutex/sql/THD::LOCK_temporary_tables`` mutex. Bug fixed :bug:`1264952`.
 
+ Database administrator password could be seen in plain text if when ``debconf-get-selections`` was executed. Bug fixed :bug:`1018291`.
+
 Other bugs fixed: :bug:`1276445`, :bug:`1005787`, :bug:`1285064`, :bug:`1229598`, and :bug:`1277505` (upstream :mysqlbug:`71624`).