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

Proposed by Hrvoje Matijakovic on 2014-05-30
Status: Merged
Approved by: Laurynas Biveinis on 2014-05-30
Approved revision: 602
Merged at revision: 602
Proposed branch: lp:~hrvojem/percona-server/rn-5.5.37-35.1-5.6
Merge into: lp:percona-server/5.6
Diff against target: 138 lines (+27/-34)
6 files modified
doc/source/conf.py (+0/-2)
doc/source/development.rst (+4/-6)
doc/source/glossary.rst (+4/-23)
doc/source/installation/apt_repo.rst (+0/-1)
doc/source/ps-versions-comparison.rst (+17/-2)
doc/source/release-notes/Percona-Server-5.6.16-64.0.rst (+2/-0)
To merge this branch: bzr merge lp:~hrvojem/percona-server/rn-5.5.37-35.1-5.6
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-05-30 Approve on 2014-05-30
Review via email: mp+221541@code.launchpad.net
To post a comment you must log in.
review: Needs Fixing
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/source/conf.py'
2--- doc/source/conf.py 2014-05-06 12:43:39 +0000
3+++ doc/source/conf.py 2014-05-30 13:33:18 +0000
4@@ -118,8 +118,6 @@
5
6 .. |MySQL| replace:: *MySQL*
7
8-.. |Drizzle| replace:: *Drizzle*
9-
10 .. |MariaDB| replace:: *MariaDB*
11
12 .. |tar4ibd| replace:: :program:`tar4ibd`
13
14=== modified file 'doc/source/development.rst'
15--- doc/source/development.rst 2013-05-27 13:59:13 +0000
16+++ doc/source/development.rst 2014-05-30 13:33:18 +0000
17@@ -8,12 +8,10 @@
18
19 Submitting Changes
20 ==================
21-This process is very much modeled on what is being used by
22-`Drizzle <http://www.drizzle.org>`_. The Drizzle project went through
23-several iterations and refinements before settling on this process. It
24-has been found to both keep trunk in a constant state of stability
25-(allowing for a release at any time) and minimizing wasted time by
26-developers due to broken code from somebody else interfering with their day.
27+
28+We keep trunk in a constant state of stability to allow for a release at
29+any time and to minimize wasted time by developers due to broken code
30+from somebody else interfering with their day.
31
32 You should also be familiar with our |Jenkins| setup.
33
34
35=== modified file 'doc/source/glossary.rst'
36--- doc/source/glossary.rst 2013-05-27 13:59:13 +0000
37+++ doc/source/glossary.rst 2014-05-30 13:33:18 +0000
38@@ -18,24 +18,6 @@
39 Consistency means that each transaction that modifies the database
40 takes it from one consistent state to another.
41
42- Drizzle
43- Drizzle: a database for the cloud.
44-
45- `Drizzle <http://www.drizzle.org/>`_ is a community-driven open source project that is forked
46- from the popular MySQL database. The Drizzle team has removed
47- non-essential code, re-factored the remaining code into a
48- plugin-based architecture and modernized the code base moving to
49- C++.
50-
51- Drizzle Charter
52- * A database optimized for Cloud infrastructure and Web applications.
53- * Design for massive concurrency on modern multi-cpu architecture
54- * Optimize memory for increased performance and parallelism
55- * Open source, open community, open design Scope
56- * Re-designed modular architecture providing plugins with defined APIs
57- * Simple design for ease of use and administration
58- * Reliable, ACID transactional
59-
60 Durability
61 Once a transaction is committed, it will remain so.
62
63@@ -50,11 +32,10 @@
64
65 InnoDB
66 A :term:`Storage Engine` for MySQL and derivatives (:term:`Percona
67- Server`, :term:`MariaDB`, :term:`Drizzle`) originally written by
68- Innobase Oy, since acquired by Oracle. It provides :term:`ACID`
69- compliant storage engine with :term:`foreign key` support. As of
70- :term:`MySQL` version 5.5, InnoDB became the default storage engine
71- on all platforms.
72+ Server`, :term:`MariaDB`) originally written by Innobase Oy, since
73+ acquired by Oracle. It provides :term:`ACID` compliant storage engine
74+ with :term:`foreign key` support. As of :term:`MySQL` version 5.5,
75+ InnoDB became the default storage engine on all platforms.
76
77 Jenkins
78 `Jenkins <http://www.jenkins-ci.org>`_ is a continuous integration
79
80=== modified file 'doc/source/installation/apt_repo.rst'
81--- doc/source/installation/apt_repo.rst 2014-05-06 12:43:39 +0000
82+++ doc/source/installation/apt_repo.rst 2014-05-30 13:33:18 +0000
83@@ -37,7 +37,6 @@
84
85 * 10.04LTS (lucid)
86 * 12.04LTS (precise)
87- * 13.04 (raring)
88 * 13.10 (saucy)
89 * 14.04LTS (trusty)
90
91
92=== modified file 'doc/source/ps-versions-comparison.rst'
93--- doc/source/ps-versions-comparison.rst 2014-04-25 10:55:01 +0000
94+++ doc/source/ps-versions-comparison.rst 2014-05-30 13:33:18 +0000
95@@ -71,8 +71,8 @@
96 - :ref:`Handle BLOB End of Line <ps55:mysql_remove_eol_carret>`
97 - Replaced by the upstream implementation [#n-9]_
98 * - :ref:`Ability to change database for mysqlbinlog <ps51:mysqlbinlog_change_db>`
99- - Feature not implemented
100- - Feature not implemented
101+ - :ref:`Ability to change database for mysqlbinlog <ps55:mysqlbinlog_change_db>`
102+ - :ref:`Ability to change database for mysqlbinlog <ps56:mysqlbinlog_change_db>`
103 * - :ref:`Replication Stop Recovery <ps51:replication_skip_single_statement>`
104 - Feature not implemented
105 - Feature not implemented
106@@ -208,6 +208,21 @@
107 * - Feature not implemented
108 - Feature not implemented
109 - :ref:`Per-query variable statement <ps56:per_query_variable_statement>`
110+ * - Feature not implemented
111+ - :ref:`Extended mysqlbinlog <ps55:extended_mysqlbinlog>`
112+ - :ref:`Extended mysqlbinlog <ps56:extended_mysqlbinlog>`
113+ * - Feature not implemented
114+ - :ref:`Slow Query Log Rotation and Expiration <ps55:slowlog_rotation>`
115+ - :ref:`Slow Query Log Rotation and Expiration <ps56:slowlog_rotation>`
116+ * - Feature not implemented
117+ - :ref:`Metrics for scalability measurement <ps55:scalability_metrics_plugin>`
118+ - :ref:`Metrics for scalability measurement <ps56:scalability_metrics_plugin>`
119+ * - Feature not implemented
120+ - :ref:`Audit Log <ps55:audit_log_plugin>`
121+ - :ref:`Audit Log <ps56:audit_log_plugin>`
122+ * - Feature not implemented
123+ - Feature not implemented
124+ - :ref:`Backup Locks <ps56:backup_locks>`
125
126
127 Other Reading
128
129=== modified file 'doc/source/release-notes/Percona-Server-5.6.16-64.0.rst'
130--- doc/source/release-notes/Percona-Server-5.6.16-64.0.rst 2014-03-10 15:05:00 +0000
131+++ doc/source/release-notes/Percona-Server-5.6.16-64.0.rst 2014-05-30 13:33:18 +0000
132@@ -66,4 +66,6 @@
133
134 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`.
135
136+ Database administrator password could be seen in plain text if when ``debconf-get-selections`` was executed. Bug fixed :bug:`1018291`.
137+
138 Other bugs fixed: :bug:`1276445`, :bug:`1005787`, :bug:`1285064`, :bug:`1229598`, and :bug:`1277505` (upstream :mysqlbug:`71624`).

Subscribers

People subscribed via source and target branches