Merge lp:~hrvojem/percona-server/rn-5.1.67-14.3-5.5 into lp:percona-server/5.5
- rn-5.1.67-14.3-5.5
- Merge into 5.5
Proposed by
Hrvoje Matijakovic
| Status: | Merged |
|---|---|
| Approved by: | Stewart Smith |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 403 |
| Proposed branch: | lp:~hrvojem/percona-server/rn-5.1.67-14.3-5.5 |
| Merge into: | lp:percona-server/5.5 |
| Diff against target: |
192 lines (+62/-18) 3 files modified
doc/source/conf.py (+3/-3) doc/source/release-notes/Percona-Server-5.5.29-29.4.rst (+14/-0) doc/source/upstream-bug-fixes.rst (+45/-15) |
| To merge this branch: | bzr merge lp:~hrvojem/percona-server/rn-5.1.67-14.3-5.5 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Stewart Smith (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
| Stewart Smith (stewart) : | # |
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 2013-01-15 08:59:21 +0000 | |||
| 3 | +++ doc/source/conf.py 2013-01-18 11:14:24 +0000 | |||
| 4 | @@ -54,7 +54,7 @@ | |||
| 5 | 54 | # The short X.Y version. | 54 | # The short X.Y version. |
| 6 | 55 | version = '5.5' | 55 | version = '5.5' |
| 7 | 56 | # The full version, including alpha/beta/rc tags. | 56 | # The full version, including alpha/beta/rc tags. |
| 9 | 57 | release = '5.5.28-29.3' | 57 | release = '5.5.29-29.4' |
| 10 | 58 | 58 | ||
| 11 | 59 | # The language for content autogenerated by Sphinx. Refer to documentation | 59 | # The language for content autogenerated by Sphinx. Refer to documentation |
| 12 | 60 | # for a list of supported languages. | 60 | # for a list of supported languages. |
| 13 | @@ -225,7 +225,7 @@ | |||
| 14 | 225 | # (source start file, target name, title, author, documentclass [howto/manual]). | 225 | # (source start file, target name, title, author, documentclass [howto/manual]). |
| 15 | 226 | latex_documents = [ | 226 | latex_documents = [ |
| 16 | 227 | ('index', 'PerconaServer-5.5.tex', u'Percona Server Documentation', | 227 | ('index', 'PerconaServer-5.5.tex', u'Percona Server Documentation', |
| 18 | 228 | u'Percona Inc', 'manual'), | 228 | u'Percona Ireland Ltd. 2009-2013', 'manual'), |
| 19 | 229 | ] | 229 | ] |
| 20 | 230 | 230 | ||
| 21 | 231 | # The name of an image file (relative to this directory) to place at the top of | 231 | # The name of an image file (relative to this directory) to place at the top of |
| 22 | @@ -258,7 +258,7 @@ | |||
| 23 | 258 | # (source start file, name, description, authors, manual section). | 258 | # (source start file, name, description, authors, manual section). |
| 24 | 259 | man_pages = [ | 259 | man_pages = [ |
| 25 | 260 | ('index', 'perconaserver55', u'Percona Server 5.5 Documentation', | 260 | ('index', 'perconaserver55', u'Percona Server 5.5 Documentation', |
| 27 | 261 | [u'Percona Inc'], 1) | 261 | [u'Percona Ireland Ltd. 2009-2013'], 1) |
| 28 | 262 | ] | 262 | ] |
| 29 | 263 | 263 | ||
| 30 | 264 | 264 | ||
| 31 | 265 | 265 | ||
| 32 | === added file 'doc/source/release-notes/Percona-Server-5.5.29-29.4.rst' | |||
| 33 | --- doc/source/release-notes/Percona-Server-5.5.29-29.4.rst 1970-01-01 00:00:00 +0000 | |||
| 34 | +++ doc/source/release-notes/Percona-Server-5.5.29-29.4.rst 2013-01-18 11:14:24 +0000 | |||
| 35 | @@ -0,0 +1,14 @@ | |||
| 36 | 1 | .. rn:: 5.5.29-29.4 | ||
| 37 | 2 | |||
| 38 | 3 | =============================== | ||
| 39 | 4 | |Percona Server| 5.5.29-29.4 | ||
| 40 | 5 | =============================== | ||
| 41 | 6 | |||
| 42 | 7 | Percona is glad to announce the release of |Percona Server| 5.5.29-29.4 on January 21th, 2012 (Downloads are available `here <http://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-5.5.29-29.4/>`_ and from the `Percona Software Repositories <http://www.percona.com/docs/wiki/repositories:start>`_). | ||
| 43 | 8 | |||
| 44 | 9 | Based on `MySQL 5.5.29 <http://dev.mysql.com/doc/refman/5.5/en/news-5.5.29.html>`_, including all the bug fixes in it, |Percona Server| 5.5.29-29.4 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.29-29.4 milestone at Launchpad <https://launchpad.net/percona-server/+milestone/5.5.29-29.4>`_. | ||
| 45 | 10 | |||
| 46 | 11 | Bug Fixes | ||
| 47 | 12 | ========= | ||
| 48 | 13 | |||
| 49 | 14 | 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.5.28-29.3`. 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*). | ||
| 50 | 0 | 15 | ||
| 51 | === modified file 'doc/source/upstream-bug-fixes.rst' | |||
| 52 | --- doc/source/upstream-bug-fixes.rst 2012-12-06 15:09:45 +0000 | |||
| 53 | +++ doc/source/upstream-bug-fixes.rst 2013-01-18 11:14:24 +0000 | |||
| 54 | @@ -5,63 +5,93 @@ | |||
| 55 | 5 | ============================================================= | 5 | ============================================================= |
| 56 | 6 | 6 | ||
| 57 | 7 | +-------------------------------------------------------------------------------------------------------------+ | 7 | +-------------------------------------------------------------------------------------------------------------+ |
| 58 | 8 | |:Upstream bug: :mysqlbug:`68045` - security vulnerability CVE-2012-4414 | | ||
| 59 | 9 | |:Launchpad bug: :bug:`1049871` | | ||
| 60 | 10 | |:Upstream state: N/A | | ||
| 61 | 11 | |:Fix Released: :rn:`5.5.29-29.4` | | ||
| 62 | 12 | |:Upstream fix: N/A | | ||
| 63 | 13 | +-------------------------------------------------------------------------------------------------------------+ | ||
| 64 | 14 | |:Upstream bug: :mysqlbug:`66550` - security vulnerability CVE-2012-4414 | | ||
| 65 | 15 | |:Launchpad bug: :bug:`1049871` | | ||
| 66 | 16 | |:Upstream state: N/A | | ||
| 67 | 17 | |:Fix Released: :rn:`5.5.28-29.3` | | ||
| 68 | 18 | |:Upstream fix: N/A | | ||
| 69 | 19 | +-------------------------------------------------------------------------------------------------------------+ | ||
| 70 | 20 | |:Upstream bug: :mysqlbug:`67685` - security vulnerability CVE-2012-5611 | | ||
| 71 | 21 | |:Launchpad bug: :bug:`1083377` | | ||
| 72 | 22 | |:Upstream state: N/A | | ||
| 73 | 23 | |:Fix Released: :rn:`5.5.28-29.3` | | ||
| 74 | 24 | |:Upstream fix: N/A | | ||
| 75 | 25 | +-------------------------------------------------------------------------------------------------------------+ | ||
| 76 | 26 | |:Upstream bug: :mysqlbug:`66237` - Temporary files created by binary log cache are not purged after transa...| | ||
| 77 | 27 | |:Launchpad bug: :bug:`1070856` | | ||
| 78 | 28 | |:Upstream state: Verified (checked on 2013-01-18) | | ||
| 79 | 29 | |:Fix Released: :rn:`5.5.28-29.3` | | ||
| 80 | 30 | |:Upstream fix: N/A | | ||
| 81 | 31 | +-------------------------------------------------------------------------------------------------------------+ | ||
| 82 | 32 | |:Upstream bug: :mysqlbug:`67606` - MySQL crashes with segmentation fault when disk quota is reached | | ||
| 83 | 33 | |:Launchpad bug: :bug:`1079596` | | ||
| 84 | 34 | |:Upstream state: Duplicate | | ||
| 85 | 35 | |:Fix Released: :rn:`5.5.28-29.3` | | ||
| 86 | 36 | |:Upstream fix: N/A | | ||
| 87 | 37 | +-------------------------------------------------------------------------------------------------------------+ | ||
| 88 | 8 | |:Upstream bug: :mysqlbug:`67737` - mysqldump test sometimes fails due to mixing stdout and stderr | | 38 | |:Upstream bug: :mysqlbug:`67737` - mysqldump test sometimes fails due to mixing stdout and stderr | |
| 89 | 9 | |:Launchpad bug: :bug:`959198` | | 39 | |:Launchpad bug: :bug:`959198` | |
| 91 | 10 | |:Upstream state: Verified (checked on 2012-12-06) | | 40 | |:Upstream state: Closed | |
| 92 | 11 | |:Fix Released: :rn:`5.5.28-29.2` | | 41 | |:Fix Released: :rn:`5.5.28-29.2` | |
| 94 | 12 | |:Upstream fix: N/A | | 42 | |:Upstream fix: 5.5.29 | |
| 95 | 13 | +-------------------------------------------------------------------------------------------------------------+ | 43 | +-------------------------------------------------------------------------------------------------------------+ |
| 96 | 14 | |:Upstream bug: :mysqlbug:`62856` - Check for "stack overrun" doesn't work with gcc-4.6, server crashes | | 44 | |:Upstream bug: :mysqlbug:`62856` - Check for "stack overrun" doesn't work with gcc-4.6, server crashes | |
| 97 | 15 | |:Launchpad bug: :bug:`1042517` | | 45 | |:Launchpad bug: :bug:`1042517` | |
| 99 | 16 | |:Upstream state: Verified (checked on 2012-12-06) | | 46 | |:Upstream state: Verified (checked on 2013-01-18) | |
| 100 | 17 | |:Fix Released: :rn:`5.5.28-29.1` | | 47 | |:Fix Released: :rn:`5.5.28-29.1` | |
| 101 | 18 | |:Upstream fix: N/A | | 48 | |:Upstream fix: N/A | |
| 102 | 19 | +-------------------------------------------------------------------------------------------------------------+ | 49 | +-------------------------------------------------------------------------------------------------------------+ |
| 103 | 20 | |:Upstream bug: :mysqlbug:`61180` - korr/store macros in my_global.h assume the argument to be a char pointer | | 50 | |:Upstream bug: :mysqlbug:`61180` - korr/store macros in my_global.h assume the argument to be a char pointer | |
| 104 | 21 | |:Launchpad bug: :bug:`1042517` | | 51 | |:Launchpad bug: :bug:`1042517` | |
| 106 | 22 | |:Upstream state: Verified (checked on 2012-12-06) | | 52 | |:Upstream state: Verified (checked on 2013-01-18) | |
| 107 | 23 | |:Fix Released: :rn:`5.5.27-29.0` | | 53 | |:Fix Released: :rn:`5.5.27-29.0` | |
| 108 | 24 | |:Upstream fix: N/A | | 54 | |:Upstream fix: N/A | |
| 109 | 25 | +-------------------------------------------------------------------------------------------------------------+ | 55 | +-------------------------------------------------------------------------------------------------------------+ |
| 110 | 26 | |:Upstream bug: :mysqlbug:`61179` - Unoptimized versions of korr/store macros in my_global.h are used on ... | | 56 | |:Upstream bug: :mysqlbug:`61179` - Unoptimized versions of korr/store macros in my_global.h are used on ... | |
| 111 | 27 | |:Launchpad bug: :bug:`1042517` | | 57 | |:Launchpad bug: :bug:`1042517` | |
| 113 | 28 | |:Upstream state: Verified (checked on 2012-12-06) | | 58 | |:Upstream state: Verified (checked on 2013-01-18) | |
| 114 | 29 | |:Fix Released: :rn:`5.5.27-29.0` | | 59 | |:Fix Released: :rn:`5.5.27-29.0` | |
| 115 | 30 | |:Upstream fix: N/A | | 60 | |:Upstream fix: N/A | |
| 116 | 31 | +-------------------------------------------------------------------------------------------------------------+ | 61 | +-------------------------------------------------------------------------------------------------------------+ |
| 117 | 32 | |:Upstream bug: :mysqlbug:`61178` - Incorrect implementation of intersect(ulonglong) in non-optimized Bitmap..| | 62 | |:Upstream bug: :mysqlbug:`61178` - Incorrect implementation of intersect(ulonglong) in non-optimized Bitmap..| |
| 118 | 33 | |:Launchpad bug: :bug:`1042517` | | 63 | |:Launchpad bug: :bug:`1042517` | |
| 120 | 34 | |:Upstream state: Verified (checked on 2012-12-06) | | 64 | |:Upstream state: Verified (checked on 2013-01-18) | |
| 121 | 35 | |:Fix Released: :rn:`5.5.27-29.0` | | 65 | |:Fix Released: :rn:`5.5.27-29.0` | |
| 122 | 36 | |:Upstream fix: N/A | | 66 | |:Upstream fix: N/A | |
| 123 | 37 | +-------------------------------------------------------------------------------------------------------------+ | 67 | +-------------------------------------------------------------------------------------------------------------+ |
| 124 | 38 | |:Upstream bug: :mysqlbug:`54127` - mysqld segfaults when built using --with-max-indexes=128 | | 68 | |:Upstream bug: :mysqlbug:`54127` - mysqld segfaults when built using --with-max-indexes=128 | |
| 125 | 39 | |:Launchpad bug: :bug:`1042517` | | 69 | |:Launchpad bug: :bug:`1042517` | |
| 127 | 40 | |:Upstream state: Verified (checked on 2012-12-06) | | 70 | |:Upstream state: Verified (checked on 2013-01-18) | |
| 128 | 41 | |:Fix Released: :rn:`5.5.27-29.0` | | 71 | |:Fix Released: :rn:`5.5.27-29.0` | |
| 129 | 42 | |:Upstream fix: N/A | | 72 | |:Upstream fix: N/A | |
| 130 | 43 | +-------------------------------------------------------------------------------------------------------------+ | 73 | +-------------------------------------------------------------------------------------------------------------+ |
| 131 | 44 | |:Upstream bug: :mysqlbug:`64800` - mysqldump with --include-master-host-port putting quotes around port no. | | 74 | |:Upstream bug: :mysqlbug:`64800` - mysqldump with --include-master-host-port putting quotes around port no. | |
| 132 | 45 | |:Launchpad bug: :bug:`1013432` | | 75 | |:Launchpad bug: :bug:`1013432` | |
| 134 | 46 | |:Upstream state: Verified (checked on 2012-12-06) | | 76 | |:Upstream state: Verified (checked on 2013-01-18) | |
| 135 | 47 | |:Fix Released: :rn:`5.5.27-28.0` | | 77 | |:Fix Released: :rn:`5.5.27-28.0` | |
| 136 | 48 | |:Upstream fix: N/A | | 78 | |:Upstream fix: N/A | |
| 137 | 49 | +-------------------------------------------------------------------------------------------------------------+ | 79 | +-------------------------------------------------------------------------------------------------------------+ |
| 138 | 50 | |:Upstream bug: :mysqlbug:`66301` - INSERT ... ON DUPLICATE KEY UPDATE + innodb_autoinc_lock_mode=1 is broken | | 80 | |:Upstream bug: :mysqlbug:`66301` - INSERT ... ON DUPLICATE KEY UPDATE + innodb_autoinc_lock_mode=1 is broken | |
| 139 | 51 | |:Launchpad bug: :bug:`1035225` | | 81 | |:Launchpad bug: :bug:`1035225` | |
| 141 | 52 | |:Upstream state: Verified (checked on 2012-12-06) | | 82 | |:Upstream state: Verified (checked on 2013-01-18) | |
| 142 | 53 | |:Fix Released: :rn:`5.5.27-28.0` | | 83 | |:Fix Released: :rn:`5.5.27-28.0` | |
| 143 | 54 | |:Upstream fix: N/A | | 84 | |:Upstream fix: N/A | |
| 144 | 55 | +-------------------------------------------------------------------------------------------------------------+ | 85 | +-------------------------------------------------------------------------------------------------------------+ |
| 145 | 56 | |:Upstream bug: :mysqlbug:`60743` - typo in cmake/dtrace.cmake | | 86 | |:Upstream bug: :mysqlbug:`60743` - typo in cmake/dtrace.cmake | |
| 146 | 57 | |:Launchpad bug: :bug:`1013455` | | 87 | |:Launchpad bug: :bug:`1013455` | |
| 148 | 58 | |:Upstream state: Verified (checked on 2012-12-06) | | 88 | |:Upstream state: Verified (checked on 2013-01-18) | |
| 149 | 59 | |:Fix Released: :rn:`5.5.25a-27.1` | | 89 | |:Fix Released: :rn:`5.5.25a-27.1` | |
| 150 | 60 | |:Upstream fix: N/A | | 90 | |:Upstream fix: N/A | |
| 151 | 61 | +-------------------------------------------------------------------------------------------------------------+ | 91 | +-------------------------------------------------------------------------------------------------------------+ |
| 152 | 62 | |:Upstream bug: :mysqlbug:`64663` - Segfault when adding indexes to InnoDB temporary tables | | 92 | |:Upstream bug: :mysqlbug:`64663` - Segfault when adding indexes to InnoDB temporary tables | |
| 153 | 63 | |:Launchpad bug: :bug:`999147` | | 93 | |:Launchpad bug: :bug:`999147` | |
| 155 | 64 | |:Upstream state: Open (checked on 2012-12-06) | | 94 | |:Upstream state: Verified (checked on 2013-01-18) | |
| 156 | 65 | |:Fix Released: :rn:`5.5.24-26.0` | | 95 | |:Fix Released: :rn:`5.5.24-26.0` | |
| 157 | 66 | |:Upstream fix: N/A | | 96 | |:Upstream fix: N/A | |
| 158 | 67 | +-------------------------------------------------------------------------------------------------------------+ | 97 | +-------------------------------------------------------------------------------------------------------------+ |
| 159 | @@ -79,7 +109,7 @@ | |||
| 160 | 79 | +-------------------------------------------------------------------------------------------------------------+ | 109 | +-------------------------------------------------------------------------------------------------------------+ |
| 161 | 80 | |:Upstream bug: :mysqlbug:`64432` - Bug :mysqlbug:`54330` (Broken fast index creation) was never fixed in 5.5 | | 110 | |:Upstream bug: :mysqlbug:`64432` - Bug :mysqlbug:`54330` (Broken fast index creation) was never fixed in 5.5 | |
| 162 | 81 | |:Launchpad bug: :bug:`939485` | | 111 | |:Launchpad bug: :bug:`939485` | |
| 164 | 82 | |:Upstream state: Patch Queued (checked on 2012-12-06) | | 112 | |:Upstream state: Documenting (checked on 2013-01-18) | |
| 165 | 83 | |:Fix Released: :rn:`5.5.21-25.0` | | 113 | |:Fix Released: :rn:`5.5.21-25.0` | |
| 166 | 84 | |:Upstream fix: N/A | | 114 | |:Upstream fix: N/A | |
| 167 | 85 | +-------------------------------------------------------------------------------------------------------------+ | 115 | +-------------------------------------------------------------------------------------------------------------+ |
| 168 | @@ -103,7 +133,7 @@ | |||
| 169 | 103 | +-------------------------------------------------------------------------------------------------------------+ | 133 | +-------------------------------------------------------------------------------------------------------------+ |
| 170 | 104 | |:Upstream bug: :mysqlbug:`62516` - Fast index creation does not update index statistics | | 134 | |:Upstream bug: :mysqlbug:`62516` - Fast index creation does not update index statistics | |
| 171 | 105 | |:Launchpad bug: :bug:`857590` | | 135 | |:Launchpad bug: :bug:`857590` | |
| 173 | 106 | |:Upstream state: Verified (checked on 2012-12-06) | | 136 | |:Upstream state: Verified (checked on 2013-01-18) | |
| 174 | 107 | |:Fix Released: :rn:`5.5.16-22.0` | | 137 | |:Fix Released: :rn:`5.5.16-22.0` | |
| 175 | 108 | |:Upstream fix: N/A | | 138 | |:Upstream fix: N/A | |
| 176 | 109 | +-------------------------------------------------------------------------------------------------------------+ | 139 | +-------------------------------------------------------------------------------------------------------------+ |
| 177 | @@ -115,13 +145,13 @@ | |||
| 178 | 115 | +-------------------------------------------------------------------------------------------------------------+ | 145 | +-------------------------------------------------------------------------------------------------------------+ |
| 179 | 116 | |:Upstream bug: :mysqlbug:`61595` - mysql-test/include/wait_for_slave_param.inc timeout logic is incorrect | | 146 | |:Upstream bug: :mysqlbug:`61595` - mysql-test/include/wait_for_slave_param.inc timeout logic is incorrect | |
| 180 | 117 | |:Launchpad bug: :bug:`800035` | | 147 | |:Launchpad bug: :bug:`800035` | |
| 182 | 118 | |:Upstream state: Verified (checked on 2012-12-06) | | 148 | |:Upstream state: Verified (checked on 2013-01-18) | |
| 183 | 119 | |:Fix Released: :rn:`5.5.13-20.4` | | 149 | |:Fix Released: :rn:`5.5.13-20.4` | |
| 184 | 120 | |:Upstream fix: N/A | | 150 | |:Upstream fix: N/A | |
| 185 | 121 | +-------------------------------------------------------------------------------------------------------------+ | 151 | +-------------------------------------------------------------------------------------------------------------+ |
| 186 | 122 | |:Upstream bug: :mysqlbug:`60788` - InnoDB crashes with an assertion failure when receiving a signal on pwrite| | 152 | |:Upstream bug: :mysqlbug:`60788` - InnoDB crashes with an assertion failure when receiving a signal on pwrite| |
| 187 | 123 | |:Launchpad bug: :bug:`764395` | | 153 | |:Launchpad bug: :bug:`764395` | |
| 189 | 124 | |:Upstream state: Verified (checked on 2012-12-06) | | 154 | |:Upstream state: Duplicate | |
| 190 | 125 | |:Fix Released: :rn:`5.5.11-20.2` | | 155 | |:Fix Released: :rn:`5.5.11-20.2` | |
| 191 | 126 | |:Upstream fix: N/A | | 156 | |:Upstream fix: N/A | |
| 192 | 127 | +-------------------------------------------------------------------------------------------------------------+ | 157 | +-------------------------------------------------------------------------------------------------------------+ |
