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