Merge lp:~hrvojem/percona-server/bug1202719-5.5 into lp:percona-server/5.5

Proposed by Hrvoje Matijakovic on 2014-02-05
Status: Merged
Approved by: Laurynas Biveinis on 2014-02-05
Approved revision: 608
Merged at revision: 622
Proposed branch: lp:~hrvojem/percona-server/bug1202719-5.5
Merge into: lp:percona-server/5.5
Diff against target: 211 lines (+39/-26)
3 files modified
doc/source/index.rst (+1/-1)
doc/source/installation/yum_repo.rst (+12/-11)
doc/source/upstream-bug-fixes.rst (+26/-14)
To merge this branch: bzr merge lp:~hrvojem/percona-server/bug1202719-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis 2014-02-05 Approve on 2014-02-05
Review via email: mp+204881@code.launchpad.net
To post a comment you must log in.
review: Approve
609. By Hrvoje Matijakovic on 2014-02-05

- merged trunk to resolve conflicts

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/source/index.rst'
2--- doc/source/index.rst 2013-12-19 12:22:20 +0000
3+++ doc/source/index.rst 2014-02-05 14:39:31 +0000
4@@ -78,6 +78,7 @@
5 performance/innodb_thread_concurrency_timer_based
6 performance/innodb_numa_support
7 performance/handlersocket
8+ performance/buff_read_ahead_area
9 performance/threadpool
10 performance/binary_group_commit
11
12@@ -91,7 +92,6 @@
13 flexibility/innodb_files_extend
14 flexibility/log_warnings_suppress
15 flexibility/mysql_remove_eol_carret
16- flexibility/buff_read_ahead_area
17 flexibility/innodb_fast_shutdown
18 flexibility/improved_memory_engine
19 flexibility/max_binlog_files
20
21=== modified file 'doc/source/installation/yum_repo.rst'
22--- doc/source/installation/yum_repo.rst 2012-09-17 07:36:57 +0000
23+++ doc/source/installation/yum_repo.rst 2014-02-05 14:39:31 +0000
24@@ -13,7 +13,7 @@
25
26 Execute the following command as a ``root`` user, replacing ``x86_64`` with ``i386`` if you are not running a 64-bit operating system: ::
27
28- $ rpm -Uhv http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm
29+ $ yum install http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm
30
31 You should see some output such as the following: ::
32
33@@ -46,15 +46,16 @@
34
35 You should see output similar to the following: ::
36
37- percona-release.x86_64 0.0-1 installed
38- ...
39- Percona-Server-client-51.x86_64 5.1.47-rel11.1.51.rhel5 percona
40- Percona-Server-devel-51.x86_64 5.1.47-rel11.1.51.rhel5 percona
41- Percona-Server-server-51.x86_64 5.1.47-rel11.1.51.rhel5 percona
42- Percona-Server-shared-51.x86_64 5.1.47-rel11.1.51.rhel5 percona
43- Percona-Server-test-51.x86_64 5.1.47-rel11.1.51.rhel5 percona
44- ...
45- xtrabackup.x86_64 1.2-22.rhel5 percona
46+ percona-release.x86_64 0.0-1 @/percona-release-0.0-1.x86_64
47+ ...
48+ Percona-Server-client-55.x86_64 5.5.35-rel33.0.611.rhel6 percona
49+ Percona-Server-devel-55.x86_64 5.5.35-rel33.0.611.rhel6 percona
50+ Percona-Server-server-55.x86_64 5.5.35-rel33.0.611.rhel6 percona
51+ Percona-Server-shared-55.x86_64 5.5.35-rel33.0.611.rhel6 percona
52+ Percona-Server-test-55.x86_64 5.5.35-rel33.0.611.rhel6 percona
53+ ...
54+ percona-xtrabackup.x86_64 2.1.7-721.rhel6 percona
55+
56
57 Supported Platforms
58 ===================
59@@ -78,7 +79,7 @@
60
61 Percona offers fresh beta builds from the experimental repository. To subscribe to the experimental repository, install the experimental *RPM*: ::
62
63- rpm -Uhv http://repo.percona.com/testing/centos/6/os/noarch/percona-testing-0.0-1.noarch.rpm
64+ yum install http://repo.percona.com/testing/centos/6/os/noarch/percona-testing-0.0-1.noarch.rpm
65
66 .. note::
67 This repository works for both RHEL/CentOS 5 and RHEL/CentOS 6
68
69=== renamed file 'doc/source/flexibility/buff_read_ahead_area.rst' => 'doc/source/performance/buff_read_ahead_area.rst'
70=== modified file 'doc/source/upstream-bug-fixes.rst'
71--- doc/source/upstream-bug-fixes.rst 2013-12-19 12:22:20 +0000
72+++ doc/source/upstream-bug-fixes.rst 2014-02-05 14:39:31 +0000
73@@ -13,7 +13,7 @@
74 +-------------------------------------------------------------------------------------------------------------+
75 |:Upstream bug: :mysqlbug:`69639` - mysql failed to build with dtrace Sun D 1.11 |
76 |:Launchpad bug: :bug:`1196460` |
77-|:Upstream state: Open (checked on 2013-12-18) |
78+|:Upstream state: Open (checked on 2014-02-05) |
79 |:Fix Released: :rn:`5.5.33-31.1` |
80 |:Upstream fix: N/A |
81 +-------------------------------------------------------------------------------------------------------------+
82@@ -25,7 +25,7 @@
83 +-------------------------------------------------------------------------------------------------------------+
84 |:Upstream bug: :mysqlbug:`42415` - UPDATE/DELETE with LIMIT clause unsafe for SBL even with ORDER BY PK ... |
85 |:Launchpad bug: :bug:`1132194` |
86-|:Upstream state: Verified (checked on 2013-12-18) |
87+|:Upstream state: Verified (checked on 2014-02-05) |
88 |:Fix Released: :rn:`5.5.32-31.0` |
89 |:Upstream fix: N/A |
90 +-------------------------------------------------------------------------------------------------------------+
91@@ -37,7 +37,7 @@
92 +-------------------------------------------------------------------------------------------------------------+
93 |:Upstream bug: :mysqlbug:`68970` - fsp_reserve_free_extents switches from small to big tblspace handling ... |
94 |:Launchpad bug: :bug:`1169494` |
95-|:Upstream state: Verified (checked on 2013-12-18) |
96+|:Upstream state: Verified (checked on 2014-02-05) |
97 |:Fix Released: :rn:`5.5.32-31.0` |
98 |:Upstream fix: N/A |
99 +-------------------------------------------------------------------------------------------------------------+
100@@ -49,7 +49,7 @@
101 +-------------------------------------------------------------------------------------------------------------+
102 |:Upstream bug: :mysqlbug:`68999` - SSL_OP_NO_COMPRESSION not defined |
103 |:Launchpad bug: :bug:`1183610` |
104-|:Upstream state: No Feedback (checked on 2013-12-18) |
105+|:Upstream state: No Feedback (checked on 2014-02-05) |
106 |:Fix Released: :rn:`5.5.31-30.3` |
107 |:Upstream fix: N/A |
108 +-------------------------------------------------------------------------------------------------------------+
109@@ -61,7 +61,7 @@
110 +-------------------------------------------------------------------------------------------------------------+
111 |:Upstream bug: :mysqlbug:`68845` - Unnecessary log_sys->mutex reacquisition in mtr_log_reserve_and_write() |
112 |:Launchpad bug: :bug:`1163439` |
113-|:Upstream state: Verified (checked on 2013-12-18) |
114+|:Upstream state: Verified (checked on 2014-02-05) |
115 |:Fix Released: :rn:`5.5.30-30.2` |
116 |:Upstream fix: N/A |
117 +-------------------------------------------------------------------------------------------------------------+
118@@ -91,13 +91,13 @@
119 +-------------------------------------------------------------------------------------------------------------+
120 |:Upstream bug: :mysqlbug:`68476` - Suboptimal code in my_strnxfrm_simple() |
121 |:Launchpad bug: :bug:`1132350` |
122-|:Upstream state: Verified (checked on 2013-12-18) |
123+|:Upstream state: Verified (checked on 2014-02-05) |
124 |:Fix Released: :rn:`5.5.30-30.1` |
125 |:Upstream fix: N/A |
126 +-------------------------------------------------------------------------------------------------------------+
127 |:Upstream bug: :mysqlbug:`68116` - InnoDB monitor may hit an assertion error in buf_page_get_gen in debug ...|
128 |:Launchpad bug: :bug:`1100178` |
129-|:Upstream state: Analyzing (checked on 2013-12-18) |
130+|:Upstream state: Verified (checked on 2014-02-05) |
131 |:Fix Released: :rn:`5.5.29-30.0` |
132 |:Upstream fix: N/A |
133 +-------------------------------------------------------------------------------------------------------------+
134@@ -187,13 +187,13 @@
135 +-------------------------------------------------------------------------------------------------------------+
136 |:Upstream bug: :mysqlbug:`61180` - korr/store macros in my_global.h assume the argument to be a char pointer |
137 |:Launchpad bug: :bug:`1042517` |
138-|:Upstream state: Verified (checked on 2013-12-18) |
139+|:Upstream state: Verified (checked on 2014-02-05) |
140 |:Fix Released: :rn:`5.5.27-29.0` |
141 |:Upstream fix: N/A |
142 +-------------------------------------------------------------------------------------------------------------+
143 |:Upstream bug: :mysqlbug:`61178` - Incorrect implementation of intersect(ulonglong) in non-optimized Bitmap..|
144 |:Launchpad bug: :bug:`1042517` |
145-|:Upstream state: Verified (checked on 2013-12-18) |
146+|:Upstream state: Verified (checked on 2014-02-05) |
147 |:Fix Released: :rn:`5.5.27-29.0` |
148 |:Upstream fix: N/A |
149 +-------------------------------------------------------------------------------------------------------------+
150@@ -205,7 +205,7 @@
151 +-------------------------------------------------------------------------------------------------------------+
152 |:Upstream bug: :mysqlbug:`64800` - mysqldump with --include-master-host-port putting quotes around port no. |
153 |:Launchpad bug: :bug:`1013432` |
154-|:Upstream state: Verified (checked on 2013-12-18) |
155+|:Upstream state: Verified (checked on 2014-02-05) |
156 |:Fix Released: :rn:`5.5.27-28.0` |
157 |:Upstream fix: N/A |
158 +-------------------------------------------------------------------------------------------------------------+
159@@ -251,6 +251,12 @@
160 |:Fix Released: :rn:`5.5.21-25.0` |
161 |:Upstream fix: 5.5.28 |
162 +-------------------------------------------------------------------------------------------------------------+
163+|:Upstream bug: :mysqlbug:`71183` - os_file_fsync() should handle fsync() returning EINTR |
164+|:Launchpad bug: :bug:`1262651` |
165+|:Upstream state: Verified (checked on 2014-02-05) |
166+|:Fix Released: :rn:`5.5.20-24.1` |
167+|:Upstream fix: N/A |
168++-------------------------------------------------------------------------------------------------------------+
169 |:Upstream bug: :mysqlbug:`63451` - atomic/x86-gcc.h:make_atomic_cas_body64 potential miscompilation bug |
170 |:Launchpad bug: :bug:`878022` |
171 |:Upstream state: Closed |
172@@ -271,13 +277,13 @@
173 +-------------------------------------------------------------------------------------------------------------+
174 |:Upstream bug: :mysqlbug:`62516` - Fast index creation does not update index statistics |
175 |:Launchpad bug: :bug:`857590` |
176-|:Upstream state: Verified (checked on 2013-12-18) |
177+|:Upstream state: Verified (checked on 2014-02-05) |
178 |:Fix Released: :rn:`5.5.16-22.0` |
179 |:Upstream fix: N/A |
180 +-------------------------------------------------------------------------------------------------------------+
181 |:Upstream bug: :mysqlbug:`25007` - memory tables with dynamic rows format |
182 |:Launchpad bug: N/A |
183-|:Upstream state: Verified (checked on 2013-12-18) |
184+|:Upstream state: Verified (checked on 2014-02-05) |
185 |:Fix Released: :rn:`5.5.15-21.0` |
186 |:Upstream fix: N/A |
187 +-------------------------------------------------------------------------------------------------------------+
188@@ -295,7 +301,7 @@
189 +-------------------------------------------------------------------------------------------------------------+
190 |:Upstream bug: :mysqlbug:`61595` - mysql-test/include/wait_for_slave_param.inc timeout logic is incorrect |
191 |:Launchpad bug: :bug:`800035` |
192-|:Upstream state: Verified (checked on 2013-12-18) |
193+|:Upstream state: Verified (checked on 2014-02-05) |
194 |:Fix Released: :rn:`5.5.13-20.4` |
195 |:Upstream fix: N/A |
196 +-------------------------------------------------------------------------------------------------------------+
197@@ -325,7 +331,13 @@
198 +-------------------------------------------------------------------------------------------------------------+
199 |:Upstream bug: :mysqlbug:`69146` - Optimization in buf_pool_get_oldest_modification if srv_buf_pool_instances|
200 |:Launchpad bug: :bug:`1176496` |
201-|:Upstream state: Open (checked on 2013-12-18) |
202+|:Upstream state: Open (checked on 2014-02-05) |
203+|:Fix Released: :rn:`5.5.8-20.0` |
204+|:Upstream fix: N/A |
205++-------------------------------------------------------------------------------------------------------------+
206+|:Upstream bug: :mysqlbug:`54814` - make BUF_READ_AHEAD_AREA a constant |
207+|:Launchpad bug: :bug:`606811` |
208+|:Upstream state: Closed |
209 |:Fix Released: :rn:`5.5.8-20.0` |
210 |:Upstream fix: N/A |
211 +-------------------------------------------------------------------------------------------------------------+

Subscribers

People subscribed via source and target branches