Merge lp:~percona-core/percona-server/release-5.1.67-14.3 into lp:percona-server/5.1

Proposed by Stewart Smith on 2013-03-26
Status: Merged
Approved by: Stewart Smith on 2013-03-26
Approved revision: 506
Merged at revision: 548
Proposed branch: lp:~percona-core/percona-server/release-5.1.67-14.3
Merge into: lp:percona-server/5.1
Diff against target: 331 lines (+114/-17) (has conflicts)
9 files modified
Makefile (+2/-2)
build/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch (+11/-11)
build/debian/rules (+1/-1)
build/percona-server.spec (+2/-2)
build/percona-shared-compat.spec (+1/-1)
doc/source/conf.py (+4/-0)
doc/source/release-notes/Percona-Server-5.1.66-14.2.rst (+4/-0)
doc/source/release-notes/Percona-Server-5.1.67-14.3.rst (+20/-0)
doc/source/upstream-bug-fixes.rst (+69/-0)
Text conflict in doc/source/conf.py
Text conflict in doc/source/release-notes/Percona-Server-5.1.66-14.2.rst
Text conflict in doc/source/release-notes/Percona-Server-5.1.67-14.3.rst
Text conflict in doc/source/upstream-bug-fixes.rst
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.1.67-14.3
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve on 2013-03-26
Alexey Kopytov 2013-03-26 Pending
Review via email: mp+155384@code.launchpad.net

This proposal supersedes a proposal from 2013-02-18.

Description of the change

Changes for release 5.1.67-14.3

(Stewart says: resubmitting to regenerate diff now that main 5.1.67 branch is merged)

To post a comment you must log in.
Alexey Kopytov (akopytov) : Posted in a previous version of this proposal
review: Approve
Stewart Smith (stewart) wrote :

Approved previously, just a resubmit to regenerate diff.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2013-01-09 19:16:16 +0000
3+++ Makefile 2013-03-26 01:29:25 +0000
4@@ -1,5 +1,5 @@
5-MYSQL_VERSION=5.1.66
6-PERCONA_SERVER_VERSION=rel14.2
7+MYSQL_VERSION=5.1.67
8+PERCONA_SERVER_VERSION=rel14.3
9 PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
10 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
11 PERCONA_SERVER_SHORT_2 ?=Percona-Server
12
13=== modified file 'Percona-Server/sql/log.cc'
14=== modified file 'Percona-Server/sql/log_event.cc'
15=== modified file 'Percona-Server/sql/sql_connect.cc'
16=== modified file 'Percona-Server/storage/innodb_plugin/buf/buf0buf.c'
17=== modified file 'Percona-Server/storage/innodb_plugin/buf/buf0lru.c'
18=== modified file 'Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc'
19=== modified file 'Percona-Server/storage/innodb_plugin/handler/i_s.cc'
20=== modified file 'Percona-Server/storage/innodb_plugin/log/log0online.c'
21=== modified file 'Percona-Server/storage/innodb_plugin/os/os0file.c'
22=== modified file 'build/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch'
23--- build/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch 2010-05-31 13:57:21 +0000
24+++ build/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch 2013-03-26 01:29:25 +0000
25@@ -6,19 +6,19 @@
26 ## DP: Reported as http://bugs.mysql.com/bug.php?id=31361
27
28 @DPATCH@
29-
30---- old/scripts/mysqld_safe.sh 2006-07-29 13:12:34.000000000 +0200
31-+++ old/scripts/mysqld_safe.sh 2006-07-29 13:14:08.000000000 +0200
32-@@ -16,8 +16,6 @@
33- # This command can be used as pipe to syslog. With "-s" it also logs to stderr.
34- ERR_LOGGER="logger -p daemon.err -t mysqld_safe -i"
35+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' Percona-Server~/scripts/mysqld_safe.sh Percona-Server/scripts/mysqld_safe.sh
36+--- Percona-Server~/scripts/mysqld_safe.sh 2013-01-23 18:03:54.000000000 -0500
37++++ Percona-Server/scripts/mysqld_safe.sh 2013-01-23 18:07:38.000000000 -0500
38+@@ -25,8 +25,6 @@
39+ syslog_tag_mysqld=mysqld
40+ syslog_tag_mysqld_safe=mysqld_safe
41
42 -trap '' 1 2 3 15 # we shouldn't let anyone kill us
43 -
44- umask 007
45-
46- defaults=
47-@@ -122,7 +122,7 @@
48+ # MySQL-specific environment variable. First off, it's not really a umask,
49+ # it's the desired mode. Second, it follows umask(2), not umask(3) in that
50+ # octal needs to be explicit. Our shell might be a proper sh without printf,
51+@@ -146,7 +144,7 @@
52 # sed buffers output (only GNU sed supports a -u (unbuffered) option)
53 # which means that messages may not get sent to syslog until the
54 # mysqld process quits.
55@@ -27,7 +27,7 @@
56 ;;
57 *)
58 echo "Internal program error (non-fatal):" \
59-@@ -352,6 +350,13 @@
60+@@ -564,6 +562,13 @@
61 fi
62
63 #
64
65=== modified file 'build/debian/rules'
66--- build/debian/rules 2013-03-13 06:12:19 +0000
67+++ build/debian/rules 2013-03-26 01:29:25 +0000
68@@ -9,7 +9,7 @@
69 TMP=$(CURDIR)/debian/tmp/
70
71 major_version_default=14
72-minor_version_default=2
73+minor_version_default=3
74
75 ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
76 ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
77
78=== modified file 'build/percona-server.spec'
79--- build/percona-server.spec 2013-03-22 00:15:18 +0000
80+++ build/percona-server.spec 2013-03-26 01:29:25 +0000
81@@ -14,9 +14,9 @@
82 %define mysql_vendor Percona, Inc
83 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
84 %define community 1
85-%define mysqlversion 5.1.66
86+%define mysqlversion 5.1.67
87 %define majorversion 14
88-%define minorversion 2
89+%define minorversion 3
90 %define distribution rhel%{redhatversion}
91 %define release rel%{majorversion}.%{minorversion}.%{gotrevision}.%{distribution}
92
93
94=== modified file 'build/percona-shared-compat.spec'
95--- build/percona-shared-compat.spec 2012-10-25 17:43:28 +0000
96+++ build/percona-shared-compat.spec 2013-03-26 01:29:25 +0000
97@@ -29,7 +29,7 @@
98 # Change this to match the version of the shared libs you want to include
99 #
100 %define version55 5.5.8
101-%define version51 5.1.66
102+%define version51 5.1.67
103 %define version50 5.0.91
104 %define version41 4.1.22
105 %define version40 4.0.27
106
107=== modified file 'doc/source/conf.py'
108--- doc/source/conf.py 2013-03-05 14:25:44 +0000
109+++ doc/source/conf.py 2013-03-26 01:29:25 +0000
110@@ -54,7 +54,11 @@
111 # The short X.Y version.
112 version = '5.1.67'
113 # The full version, including alpha/beta/rc tags.
114+<<<<<<< TREE
115 release = '5.1.67-14.4'
116+=======
117+release = '5.1.67-14.3'
118+>>>>>>> MERGE-SOURCE
119
120 # The language for content autogenerated by Sphinx. Refer to documentation
121 # for a list of supported languages.
122
123=== modified file 'doc/source/release-notes/Percona-Server-5.1.66-14.2.rst'
124--- doc/source/release-notes/Percona-Server-5.1.66-14.2.rst 2013-03-21 20:28:50 +0000
125+++ doc/source/release-notes/Percona-Server-5.1.66-14.2.rst 2013-03-26 01:29:25 +0000
126@@ -4,7 +4,11 @@
127 |Percona Server| 5.1.66-14.2
128 ==============================
129
130+<<<<<<< TREE
131 Percona is glad to announce the release of |Percona Server| 5.1.66-14.2 on January 15th, 2013 (Downloads are available from `Percona Server 5.1.66-14.2 downloads <http://www.percona.com/downloads/Percona-Server-5.1/Percona-Server-5.1.66-14.2/>`_ and from the `Percona Software Repositories <http://www.percona.com/doc/percona-server/5.1/installation.html>`_).
132+=======
133+Percona is glad to announce the release of |Percona Server| 5.1.66-14.2 on January 15th, 2013 (Downloads are available from `Percona Server 5.1.66-14.2 downloads <http://www.percona.com/downloads/Percona-Server-5.1/Percona-Server-5.1.66-14.2/>`_ and from the `Percona Software Repositories <http://http://www.percona.com/doc/percona-server/5.1/installation.html>`_).
134+>>>>>>> MERGE-SOURCE
135
136 Based on `MySQL 5.1.66 <http://dev.mysql.com/doc/refman/5.1/en/news-5-1-66.html>`_, this release will include all the bug fixes in it. All of |Percona|'s software is open-source and free, all the details of the release can be found in the `5.1.66-14.2 milestone at Launchpad <https://launchpad.net/percona-server/+milestone/5.1.66-14.2>`_.
137
138
139=== modified file 'doc/source/release-notes/Percona-Server-5.1.67-14.3.rst'
140--- doc/source/release-notes/Percona-Server-5.1.67-14.3.rst 2013-03-21 20:28:50 +0000
141+++ doc/source/release-notes/Percona-Server-5.1.67-14.3.rst 2013-03-26 01:29:25 +0000
142@@ -1,3 +1,4 @@
143+<<<<<<< TREE
144 .. rn:: 5.1.67-14.3
145
146 ==============================
147@@ -15,3 +16,22 @@
148
149 Other bug fixes: bug fixed :bug:`1087202` (*Vladislav Vaintroub*, *Laurynas Biveinis*) and bug fixed :bug:`1087218` (*Vladislav Vaintroub*, *Laurynas Biveinis*).
150
151+=======
152+.. rn:: 5.1.67-14.3
153+
154+==============================
155+ |Percona Server| 5.1.67-14.3
156+==============================
157+
158+Percona is glad to announce the release of |Percona Server| 5.1.67-14.3 on January 21st, 2013 (Downloads are available from `Percona Server 5.1.67-14.3 downloads <http://www.percona.com/downloads/Percona-Server-5.1/Percona-Server-5.1.67-14.3/>`_ and from the `Percona Software Repositories <http://http://www.percona.com/doc/percona-server/5.1/installation.html>`_).
159+
160+Based on `MySQL 5.1.67 <http://dev.mysql.com/doc/refman/5.1/en/news-5.1.67.html>`_, this release will include all the bug fixes in it. All of |Percona|'s software is open-source and free, all the details of the release can be found in the `5.1.67-14.3 milestone at Launchpad <https://launchpad.net/percona-server/+milestone/5.1.67-14.3>`_.
161+
162+Bug Fixes
163+=========
164+
165+ Fixed the upstream bug :mysqlbug:`68045` and ported a fix for the security vulnerability `CVE-2012-4414 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-4414>`_ from the |Percona Server| :rn:`5.1.66-14.2`. This bug fix replaces the upstream fix for the |MySQL| bug :mysqlbug:`66550`. More details about this can be found in Stewart's `blogpost <http://www.mysqlperformanceblog.com/2013/01/13/cve-2012-4414-in-mysql-5-5-29-and-percona-server-5-5-29/>`_. Bug fixed :bug:`1049871` (*Vlad Lesin*).
166+
167+Other bug fixes: bug fixed :bug:`1087202` (*Vladislav Vaintroub*, *Laurynas Biveinis*) and bug fixed :bug:`1087218` (*Vladislav Vaintroub*, *Laurynas Biveinis*).
168+
169+>>>>>>> MERGE-SOURCE
170
171=== modified file 'doc/source/upstream-bug-fixes.rst'
172--- doc/source/upstream-bug-fixes.rst 2013-03-22 07:24:01 +0000
173+++ doc/source/upstream-bug-fixes.rst 2013-03-26 01:29:25 +0000
174@@ -5,6 +5,7 @@
175 =============================================================
176
177 +-------------------------------------------------------------------------------------------------------------+
178+<<<<<<< TREE
179 |:Upstream bug: :mysqlbug:`68116` - InnoDB monitor may hit an assertion error in buf_page_get_gen in debug ...|
180 |:Launchpad bug: :bug:`1100178` |
181 |:Upstream state: Analyzing (checked on 2013-03-05) |
182@@ -41,57 +42,113 @@
183 |:Fix Released: :rn:`5.1.66-14.2` |
184 |:Upstream fix: N/A |
185 +-------------------------------------------------------------------------------------------------------------+
186+=======
187+|:Upstream bug: :mysqlbug:`68045` - security vulnerability CVE-2012-5611 |
188+|:Launchpad bug: :bug:`1083377` |
189+|:Upstream state: N/A |
190+|:Fix Released: :rn:`5.1.67-14.3` |
191+|:Upstream fix: N/A |
192++-------------------------------------------------------------------------------------------------------------+
193+|:Upstream bug: :mysqlbug:`67685` - security vulnerability CVE-2012-5611 |
194+|:Launchpad bug: :bug:`1083377` |
195+|:Upstream state: N/A |
196+|:Fix Released: :rn:`5.1.66-14.2` |
197+|:Upstream fix: N/A |
198++-------------------------------------------------------------------------------------------------------------+
199+|:Upstream bug: :mysqlbug:`66550` - security vulnerability CVE-2012-4414 |
200+|:Launchpad bug: :bug:`1042517` |
201+|:Upstream state: N/A |
202+|:Fix Released: :rn:`5.1.66-14.2` |
203+|:Upstream fix: N/A |
204++-------------------------------------------------------------------------------------------------------------+
205+>>>>>>> MERGE-SOURCE
206 |:Upstream bug: :mysqlbug:`61180` - korr/store macros in my_global.h assume the argument to be a char ... |
207 |:Launchpad bug: :bug:`1042517` |
208+<<<<<<< TREE
209 |:Upstream state: Verified (checked on 2013-03-05) |
210+=======
211+|:Upstream state: Verified (checked on 2013-01-18) |
212+>>>>>>> MERGE-SOURCE
213 |:Fix Released: :rn:`5.1.66-14.1` |
214 |:Upstream fix: N/A |
215 +-------------------------------------------------------------------------------------------------------------+
216 |:Upstream bug: :mysqlbug:`61179` - Unoptimized versions of korr/store macros in my_global.h are used on... |
217 |:Launchpad bug: :bug:`1042517` |
218+<<<<<<< TREE
219 |:Upstream state: Verified (checked on 2013-03-05) |
220+=======
221+|:Upstream state: Verified (checked on 2013-01-18) |
222+>>>>>>> MERGE-SOURCE
223 |:Fix Released: :rn:`5.1.66-14.1` |
224 |:Upstream fix: N/A |
225 +-------------------------------------------------------------------------------------------------------------+
226 |:Upstream bug: :mysqlbug:`61178` - Incorrect implementation of intersect(ulonglong) in non-optimized Bitmap..|
227 |:Launchpad bug: :bug:`1042517` |
228+<<<<<<< TREE
229 |:Upstream state: Verified (checked on 2013-03-05) |
230+=======
231+|:Upstream state: Verified (checked on 2013-01-18) |
232+>>>>>>> MERGE-SOURCE
233 |:Fix Released: :rn:`5.1.66-14.1` |
234 |:Upstream fix: N/A |
235 +-------------------------------------------------------------------------------------------------------------+
236 |:Upstream bug: :mysqlbug:`54127` - mysqld segfaults when built using --with-max-indexes=128 |
237 |:Launchpad bug: :bug:`1042517` |
238+<<<<<<< TREE
239 |:Upstream state: Verified (checked on 2013-03-05) |
240+=======
241+|:Upstream state: Verified (checked on 2013-01-18) |
242+>>>>>>> MERGE-SOURCE
243 |:Fix Released: :rn:`5.1.66-14.1` |
244 |:Upstream fix: N/A |
245 +-------------------------------------------------------------------------------------------------------------+
246 |:Upstream bug: :mysqlbug:`67177` - MySQL 5.1 is incompatible with automake 1.12 |
247 |:Launchpad bug: :bug:`1064953` |
248+<<<<<<< TREE
249 |:Upstream state: Verified (checked on 2013-03-05) |
250+=======
251+|:Upstream state: Verified (checked on 2013-01-18) |
252+>>>>>>> MERGE-SOURCE
253 |:Fix Released: :rn:`5.1.66-14.1` |
254 |:Upstream fix: N/A |
255 +-------------------------------------------------------------------------------------------------------------+
256 |:Upstream bug: :mysqlbug:`62856` - Check for "stack overrun" doesn't work with gcc-4.6, server crashes |
257 |:Launchpad bug: :bug:`902472` |
258+<<<<<<< TREE
259 |:Upstream state: Verified (checked on 2013-03-05) |
260+=======
261+|:Upstream state: Verified (checked on 2013-01-18) |
262+>>>>>>> MERGE-SOURCE
263 |:Fix Released: :rn:`5.1.66-14.1` |
264 |:Upstream fix: N/A |
265 +-------------------------------------------------------------------------------------------------------------+
266 |:Upstream bug: :mysqlbug:`61509` - mysqld (5.1.57) segfaults with gcc 4.6 |
267 |:Launchpad bug: :bug:`902471` |
268+<<<<<<< TREE
269 |:Upstream state: Verified (checked on 2013-03-05) |
270+=======
271+|:Upstream state: Verified (checked on 2013-01-18) |
272+>>>>>>> MERGE-SOURCE
273 |:Fix Released: :rn:`5.1.66-14.1` |
274 |:Upstream fix: N/A |
275 +-------------------------------------------------------------------------------------------------------------+
276 |:Upstream bug: :mysqlbug:`66301` - INSERT ... ON DUPLICATE KEY UPDATE + innodb_autoinc_lock_mode=1 is broken |
277 |:Launchpad bug: :bug:`1035225` |
278+<<<<<<< TREE
279 |:Upstream state: Verified (checked on 2013-03-05) |
280+=======
281+|:Upstream state: Verified (checked on 2013-01-18) |
282+>>>>>>> MERGE-SOURCE
283 |:Fix Released: :rn:`5.1.65-14.0` |
284 |:Upstream fix: N/A |
285 +-------------------------------------------------------------------------------------------------------------+
286 |:Upstream bug: :mysqlbug:`64469` - Deadlock or crash on concurrent TRUNCATE TABLE and SELECT * FROM I_S |
287 |:Launchpad bug: :bug:`903617` |
288+<<<<<<< TREE
289 |:Upstream state: Can't repeat |
290+=======
291+|:Upstream state: Analyzing (checked on 2013-01-18) |
292+>>>>>>> MERGE-SOURCE
293 |:Fix Released: :rn:`5.1.62-13.3` |
294 |:Upstream fix: N/A |
295 +-------------------------------------------------------------------------------------------------------------+
296@@ -109,7 +166,11 @@
297 +-------------------------------------------------------------------------------------------------------------+
298 |:Upstream bug: :mysqlbug:`64127` - MTR --warnings option misses some of InnoDB errors and warnings |
299 |:Launchpad bug: :bug:`937859` |
300+<<<<<<< TREE
301 |:Upstream state: Verified (checked on 2013-03-05) |
302+=======
303+|:Upstream state: Verified (checked on 2013-01-18) |
304+>>>>>>> MERGE-SOURCE
305 |:Fix Released: :rn:`5.1.62-13.3` |
306 |:Upstream fix: N/A |
307 +-------------------------------------------------------------------------------------------------------------+
308@@ -133,7 +194,11 @@
309 +-------------------------------------------------------------------------------------------------------------+
310 |:Upstream bug: :mysqlbug:`62516` - Fast index creation does not update index statistics |
311 |:Launchpad bug: :bug:`857590` |
312+<<<<<<< TREE
313 |:Upstream state: Verified (checked on 2013-03-05) |
314+=======
315+|:Upstream state: Verified (checked on 2013-01-18) |
316+>>>>>>> MERGE-SOURCE
317 |:Fix Released: :rn:`5.1.59-13.0` |
318 |:Upstream fix: N/A |
319 +-------------------------------------------------------------------------------------------------------------+
320@@ -181,7 +246,11 @@
321 +-------------------------------------------------------------------------------------------------------------+
322 |:Upstream bug: :mysqlbug:`55032` - Query cache sometime insert queries to cache, but doesn't find ... |
323 |:Launchpad bug: none |
324+<<<<<<< TREE
325 |:Upstream state: Verified (checked on 2013-03-05) |
326+=======
327+|:Upstream state: Verified (checked on 2013-01-18) |
328+>>>>>>> MERGE-SOURCE
329 |:Fix Released: :rn:`5.1.47-rel11.2` |
330 |:Upstream fix: N/A |
331 +-------------------------------------------------------------------------------------------------------------+

Subscribers

People subscribed via source and target branches