Merge lp:~hrvojem/percona-server/bug1034305-5.5 into lp:percona-server/5.5
- bug1034305-5.5
- Merge into 5.5
Proposed by
Hrvoje Matijakovic
Status: | Merged |
---|---|
Approved by: | Laurynas Biveinis |
Approved revision: | no longer in the source branch. |
Merged at revision: | 302 |
Proposed branch: | lp:~hrvojem/percona-server/bug1034305-5.5 |
Merge into: | lp:percona-server/5.5 |
Diff against target: |
428 lines (+4/-174) 6 files modified
doc/source/conf.py (+2/-0) doc/source/index.rst (+1/-0) doc/source/installation/apt_repo.rst (+0/-69) doc/source/installation/yum_repo.rst (+0/-84) doc/source/management/changed_page_tracking.rst (+1/-1) doc/source/performance/innodb_thread_concurrency_timer_based.rst (+0/-20) |
To merge this branch: | bzr merge lp:~hrvojem/percona-server/bug1034305-5.5 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Laurynas Biveinis (community) | Approve | ||
Review via email: mp+126610@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) : | # |
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 2012-09-18 05:04:43 +0000 |
3 | +++ doc/source/conf.py 2012-09-27 09:22:22 +0000 |
4 | @@ -108,6 +108,8 @@ |
5 | |
6 | .. |XtraBackup| replace:: *XtraBackup* |
7 | |
8 | +.. |Percona XtraBackup| replace:: *Percona XtraBackup* |
9 | + |
10 | .. |Percona Server| replace:: *Percona Server* |
11 | |
12 | .. |Percona| replace:: *Percona* |
13 | |
14 | === modified file 'doc/source/index.rst' |
15 | --- doc/source/index.rst 2012-09-18 05:04:43 +0000 |
16 | +++ doc/source/index.rst 2012-09-27 09:22:22 +0000 |
17 | @@ -125,6 +125,7 @@ |
18 | management/utility_user |
19 | management/secure_file_priv_extended |
20 | management/expanded_program_option_modifiers |
21 | + management/changed_page_tracking |
22 | |
23 | Diagnostics Improvements |
24 | ======================== |
25 | |
26 | === added directory 'doc/source/installation' |
27 | === removed directory 'doc/source/installation' |
28 | === added file 'doc/source/installation/apt_repo.rst' |
29 | --- doc/source/installation/apt_repo.rst 1970-01-01 00:00:00 +0000 |
30 | +++ doc/source/installation/apt_repo.rst 2012-09-27 09:22:22 +0000 |
31 | @@ -0,0 +1,67 @@ |
32 | +.. _apt_repo: |
33 | + |
34 | +=================================== |
35 | + Percona :program:`apt` Repository |
36 | +=================================== |
37 | + |
38 | +*Debian* and *Ubuntu* packages from *Percona* are signed with a key. Before using the repository, you should add the key to :program:`apt`. To do that, run the following commands: :: |
39 | + |
40 | + $ gpg --keyserver hkp://keys.gnupg.net --recv-keys 1C4CBDCDCD2EFD2A |
41 | + ... [some output removed] ... |
42 | + gpg: imported: 1 |
43 | + |
44 | + $ gpg -a --export CD2EFD2A | sudo apt-key add - |
45 | + |
46 | +Add this to :file:`/etc/apt/sources.list`, replacing ``VERSION`` with the name of your distribution: :: |
47 | + |
48 | + deb http://repo.percona.com/apt VERSION main |
49 | + deb-src http://repo.percona.com/apt VERSION main |
50 | + |
51 | +Remember to update the local cache: :: |
52 | + |
53 | + $ apt-get update |
54 | + |
55 | +After that you can install the server and client packages :: |
56 | + |
57 | + # apt-get install percona-server-server-5.5 percona-server-client-5.5 |
58 | + |
59 | + |
60 | +Supported Platforms |
61 | +=================== |
62 | + |
63 | + * x86 |
64 | + * x86_64 (also known as ``amd64``) |
65 | + |
66 | +Supported Releases |
67 | +================== |
68 | + |
69 | +Debian |
70 | +------ |
71 | + |
72 | + * 6.0 (squeeze) |
73 | + |
74 | +Ubuntu |
75 | +------ |
76 | + |
77 | + * 10.04LTS (lucid) |
78 | + * 11.10 (oneiric) |
79 | + * 12.04LTS (precise) |
80 | + |
81 | +Percona `apt` Experimental repository |
82 | +===================================== |
83 | + |
84 | +Percona offers fresh beta builds from the experimental repository. To enable it add the following lines to your :file:`/etc/apt/sources.list` , replacing ``VERSION`` with the name of your distribution: :: |
85 | + |
86 | + deb http://repo.percona.com/apt VERSION main experimental |
87 | + deb-src http://repo.percona.com/apt VERSION main experimental |
88 | + |
89 | +Apt-Pinning the packages |
90 | +======================== |
91 | + |
92 | +In some cases you might need to "pin" the selected packages to avoid the upgrades from the distribution repositories. You'll need to make a new file :file:`/etc/apt/preferences.d/00percona.pref` and add the following lines in it: :: |
93 | + |
94 | + Package: * |
95 | + Pin: release o=Percona Development Team |
96 | + Pin-Priority: 1001 |
97 | + |
98 | +For more information about the pinning you can check the official `debian wiki <http://wiki.debian.org/AptPreferences>`_. |
99 | |
100 | === removed file 'doc/source/installation/apt_repo.rst' |
101 | --- doc/source/installation/apt_repo.rst 2012-09-05 13:08:45 +0000 |
102 | +++ doc/source/installation/apt_repo.rst 1970-01-01 00:00:00 +0000 |
103 | @@ -1,69 +0,0 @@ |
104 | -.. _apt_repo: |
105 | - |
106 | -=================================== |
107 | - Percona :program:`apt` Repository |
108 | -=================================== |
109 | - |
110 | -*Debian* and *Ubuntu* packages from *Percona* are signed with a key. Before using the repository, you should add the key to :program:`apt`. To do that, run the following commands: :: |
111 | - |
112 | - $ gpg --keyserver hkp://keys.gnupg.net --recv-keys 1C4CBDCDCD2EFD2A |
113 | - ... [some output removed] ... |
114 | - gpg: imported: 1 |
115 | - |
116 | - $ gpg -a --export CD2EFD2A | sudo apt-key add - |
117 | - |
118 | -Add this to :file:`/etc/apt/sources.list`, replacing ``VERSION`` with the name of your distribution: :: |
119 | - |
120 | - deb http://repo.percona.com/apt VERSION main |
121 | - deb-src http://repo.percona.com/apt VERSION main |
122 | - |
123 | -Remember to update the local cache: :: |
124 | - |
125 | - # apt-get update |
126 | - |
127 | -After that you can install the server and client packages :: |
128 | - |
129 | - # apt-get install percona-server-server-5.5 percona-server-client-5.5 |
130 | - |
131 | - |
132 | -Supported Platforms |
133 | -=================== |
134 | - |
135 | - * x86 |
136 | - * x86_64 (also known as ``amd64``) |
137 | - |
138 | -Supported Releases |
139 | -================== |
140 | - |
141 | -Debian |
142 | ------- |
143 | - |
144 | - * 5.0 (lenny) |
145 | - * 6.0 (squeeze) |
146 | - |
147 | -Ubuntu |
148 | ------- |
149 | - |
150 | - * 10.04LTS (lucid) |
151 | - * 11.10 (oneiric) |
152 | - * 12.04LTS (precise) |
153 | - |
154 | - |
155 | -Percona `apt` Experimental repository |
156 | -===================================== |
157 | - |
158 | -Percona offers fresh beta builds from the experimental repository. To enable it add the following lines to your :file:`/etc/apt/sources.list` , replacing ``VERSION`` with the name of your distribution: :: |
159 | - |
160 | - deb http://repo.percona.com/apt VERSION main experimental |
161 | - deb-src http://repo.percona.com/apt VERSION main experimental |
162 | - |
163 | -Apt-Pinning the packages |
164 | -======================== |
165 | - |
166 | -In some cases you might need to "pin" the selected packages to avoid the upgrades from the distribution repositories. You'll need to make a new file :file:`/etc/apt/preferences.d/00percona.pref` and add the following lines in it: :: |
167 | - |
168 | - Package: * |
169 | - Pin: release o=Percona Development Team |
170 | - Pin-Priority: 1001 |
171 | - |
172 | -For more information about the pinning you can check the official `debian wiki <http://wiki.debian.org/AptPreferences>`_. |
173 | |
174 | === added file 'doc/source/installation/yum_repo.rst' |
175 | --- doc/source/installation/yum_repo.rst 1970-01-01 00:00:00 +0000 |
176 | +++ doc/source/installation/yum_repo.rst 2012-09-27 09:22:22 +0000 |
177 | @@ -0,0 +1,84 @@ |
178 | +.. _yum_repo: |
179 | + |
180 | +=================================== |
181 | + Percona :program:`yum` Repository |
182 | +=================================== |
183 | + |
184 | +The |Percona| :program:`yum` repository supports popular *RPM*-based operating systems, including the *Amazon Linux AMI*. |
185 | + |
186 | +The easiest way to install the *Percona Yum* repository is to install an *RPM* that configures :program:`yum` and installs the `Percona GPG key <http://www.percona.com/downloads/RPM-GPG-KEY-percona>`_. You can also do the installation manually. |
187 | + |
188 | +Automatic Installation |
189 | +====================== |
190 | + |
191 | +Execute the following command as a ``root`` user, replacing ``x86_64`` with ``i386`` if you are not running a 64-bit operating system: :: |
192 | + |
193 | + $ rpm -Uhv http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm |
194 | + |
195 | +You should see some output such as the following: :: |
196 | + |
197 | + Retrieving http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm |
198 | + Preparing... ########################################### [100%] |
199 | + 1:percona-release ########################################### [100%] |
200 | + |
201 | +The RPMs for the automatic installation are available at http://www.percona.com/downloads/percona-release/ and include source code. |
202 | + |
203 | +Manual Installation |
204 | +=================== |
205 | + |
206 | +To install the repository manually, place the following into a new file named :file:`/etc/yum.repos.d/Percona.repo`: :: |
207 | + |
208 | + [percona] |
209 | + name = CentOS $releasever - Percona |
210 | + baseurl=http://repo.percona.com/centos/$releasever/os/$basearch/ |
211 | + enabled = 1 |
212 | + gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-percona |
213 | + gpgcheck = 1 |
214 | + |
215 | +Also, copy the `Percona GPG key <http://www.percona.com/downloads/RPM-GPG-KEY-percona>`_ into a file named :file:`/etc/pki/rpm-gpg/RPM-GPG-KEY-percona`. |
216 | + |
217 | +Testing The Repository |
218 | +====================== |
219 | + |
220 | +Make sure packages are downloaded from the repository, by executing the following command as root: :: |
221 | + |
222 | + yum list | grep percona |
223 | + |
224 | +You should see output similar to the following: :: |
225 | + |
226 | + percona-release.x86_64 0.0-1 installed |
227 | + ... |
228 | + Percona-Server-client-51.x86_64 5.1.47-rel11.1.51.rhel5 percona |
229 | + Percona-Server-devel-51.x86_64 5.1.47-rel11.1.51.rhel5 percona |
230 | + Percona-Server-server-51.x86_64 5.1.47-rel11.1.51.rhel5 percona |
231 | + Percona-Server-shared-51.x86_64 5.1.47-rel11.1.51.rhel5 percona |
232 | + Percona-Server-test-51.x86_64 5.1.47-rel11.1.51.rhel5 percona |
233 | + ... |
234 | + xtrabackup.x86_64 1.2-22.rhel5 percona |
235 | + |
236 | +Supported Platforms |
237 | +=================== |
238 | + |
239 | + * ``x86_64`` |
240 | + * ``i386`` |
241 | + |
242 | +Supported Releases |
243 | +================== |
244 | + |
245 | +The *CentOS* repositories should work well with *Red Hat Enterprise Linux* too, provided that :program:`yum` is installed on the server. |
246 | + |
247 | +* *CentOS* 5 and *RHEL* 5 |
248 | + |
249 | +* *CentOS* 6 and *RHEL* 6 |
250 | + |
251 | +* *Amazon Linux AMI* (works the same as *CentOS* 5) |
252 | + |
253 | +Percona `yum` Experimental repository |
254 | +===================================== |
255 | + |
256 | +Percona offers fresh beta builds from the experimental repository. To subscribe to the experimental repository, install the experimental *RPM*: :: |
257 | + |
258 | + rpm -Uhv http://repo.percona.com/testing/centos/6/os/noarch/percona-testing-0.0-1.noarch.rpm |
259 | + |
260 | +.. note:: |
261 | + This repository works for both RHEL/CentOS 5 and RHEL/CentOS 6 |
262 | |
263 | === removed file 'doc/source/installation/yum_repo.rst' |
264 | --- doc/source/installation/yum_repo.rst 2012-09-05 13:08:45 +0000 |
265 | +++ doc/source/installation/yum_repo.rst 1970-01-01 00:00:00 +0000 |
266 | @@ -1,84 +0,0 @@ |
267 | -.. _yum_repo: |
268 | - |
269 | -=================================== |
270 | - Percona :program:`yum` Repository |
271 | -=================================== |
272 | - |
273 | -The |Percona| :program:`yum` repository supports popular *RPM*-based operating systems, including the *Amazon Linux AMI*. |
274 | - |
275 | -The easiest way to install the *Percona Yum* repository is to install an *RPM* that configures :program:`yum` and installs the `Percona GPG key <http://www.percona.com/downloads/RPM-GPG-KEY-percona>`_. You can also do the installation manually. |
276 | - |
277 | -Automatic Installation |
278 | -====================== |
279 | - |
280 | -Execute the following command as a ``root`` user, replacing ``x86_64`` with ``i386`` if you are not running a 64-bit operating system: :: |
281 | - |
282 | - $ rpm -Uhv http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm |
283 | - |
284 | -You should see some output such as the following: :: |
285 | - |
286 | - Retrieving http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm |
287 | - Preparing... ########################################### [100%] |
288 | - 1:percona-release ########################################### [100%] |
289 | - |
290 | -The RPMs for the automatic installation are available at http://www.percona.com/downloads/percona-release/ and include source code. |
291 | - |
292 | -Manual Installation |
293 | -=================== |
294 | - |
295 | -To install the repository manually, place the following into a new file named :file:`/etc/yum.repos.d/Percona.repo`: :: |
296 | - |
297 | - [percona] |
298 | - name = CentOS $releasever - Percona |
299 | - baseurl=http://repo.percona.com/centos/$releasever/os/$basearch/ |
300 | - enabled = 1 |
301 | - gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-percona |
302 | - gpgcheck = 1 |
303 | - |
304 | -Also, copy the `Percona GPG key <http://www.percona.com/downloads/RPM-GPG-KEY-percona>`_ into a file named :file:`/etc/pki/rpm-gpg/RPM-GPG-KEY-percona`. |
305 | - |
306 | -Testing The Repository |
307 | -====================== |
308 | - |
309 | -Make sure packages are downloaded from the repository, by executing the following command as root: :: |
310 | - |
311 | - yum list | grep percona |
312 | - |
313 | -You should see output similar to the following: :: |
314 | - |
315 | - percona-release.x86_64 0.0-1 installed |
316 | - ... |
317 | - Percona-Server-client-51.x86_64 5.1.47-rel11.1.51.rhel5 percona |
318 | - Percona-Server-devel-51.x86_64 5.1.47-rel11.1.51.rhel5 percona |
319 | - Percona-Server-server-51.x86_64 5.1.47-rel11.1.51.rhel5 percona |
320 | - Percona-Server-shared-51.x86_64 5.1.47-rel11.1.51.rhel5 percona |
321 | - Percona-Server-test-51.x86_64 5.1.47-rel11.1.51.rhel5 percona |
322 | - ... |
323 | - xtrabackup.x86_64 1.2-22.rhel5 percona |
324 | - |
325 | -Supported Platforms |
326 | -=================== |
327 | - |
328 | - * ``x86_64`` |
329 | - * ``i386`` |
330 | - |
331 | -Supported Releases |
332 | -================== |
333 | - |
334 | -The *CentOS* repositories should work well with *Red Hat Enterprise Linux* too, provided that :program:`yum` is installed on the server. |
335 | - |
336 | -* *CentOS* 5 and *RHEL* 5 |
337 | - |
338 | -* *CentOS* 6 and *RHEL* 6 |
339 | - |
340 | -* *Amazon Linux AMI* (works the same as *CentOS* 5) |
341 | - |
342 | -Percona `yum` Experimental repository |
343 | -===================================== |
344 | - |
345 | -Percona offers fresh beta builds from the experimental repository. To subscribe to the experimental repository, install the experimental *RPM*: :: |
346 | - |
347 | - rpm -Uhv http://repo.percona.com/testing/centos/6/os/noarch/percona-testing-0.0-1.noarch.rpm |
348 | - |
349 | -.. note:: |
350 | - This repository works for both RHEL/CentOS 5 and RHEL/CentOS 6 |
351 | |
352 | === modified file 'doc/source/management/changed_page_tracking.rst' |
353 | --- doc/source/management/changed_page_tracking.rst 2012-09-03 09:31:43 +0000 |
354 | +++ doc/source/management/changed_page_tracking.rst 2012-09-27 09:22:22 +0000 |
355 | @@ -34,7 +34,7 @@ |
356 | |
357 | .. variable:: innodb_track_changed_pages |
358 | |
359 | - :version 5.1.65-14.0: Variable introduced |
360 | + :version 5.5.27-29.0: Variable introduced |
361 | :cli: No |
362 | :conf: Yes |
363 | :scope: Global |
364 | |
365 | === added directory 'doc/source/performance' |
366 | === removed directory 'doc/source/performance' |
367 | === renamed file 'doc/source/performance/handlersocket.rst' => 'doc/source/performance/handlersocket.rst' |
368 | === renamed file 'doc/source/performance/innodb_doublewrite_path.rst' => 'doc/source/performance/innodb_doublewrite_path.rst' |
369 | === renamed file 'doc/source/performance/innodb_fast_checksum.rst' => 'doc/source/performance/innodb_fast_checksum.rst' |
370 | === renamed file 'doc/source/performance/innodb_lazy_drop_table.rst' => 'doc/source/performance/innodb_lazy_drop_table.rst' |
371 | === renamed file 'doc/source/performance/innodb_opt_lru_count.rst' => 'doc/source/performance/innodb_opt_lru_count.rst' |
372 | === renamed file 'doc/source/performance/innodb_purge_thread.rst' => 'doc/source/performance/innodb_purge_thread.rst' |
373 | === added file 'doc/source/performance/innodb_thread_concurrency_timer_based.rst' |
374 | --- doc/source/performance/innodb_thread_concurrency_timer_based.rst 1970-01-01 00:00:00 +0000 |
375 | +++ doc/source/performance/innodb_thread_concurrency_timer_based.rst 2012-09-27 09:22:22 +0000 |
376 | @@ -0,0 +1,24 @@ |
377 | +.. _innodb_thread_concurrency_timer_based_page: |
378 | + |
379 | +=========================================== |
380 | +InnoDB timer-based Concurrency Throttling |
381 | +=========================================== |
382 | + |
383 | +If the variable :variable:`innodb_thread_concurrency_timer_based` has been set to ``TRUE``, lock-free timer-based |InnoDB| method of handling thread concurrency will be used instead of original mutex-based method. |
384 | + |
385 | +System Variables |
386 | +================ |
387 | + |
388 | +.. variable:: innodb_thread_concurrency_timer_based |
389 | + |
390 | + :cli: Yes |
391 | + :conf: Yes |
392 | + :scope: Global |
393 | + :dyn: No |
394 | + :vartype: BOOL |
395 | + :default: FALSE |
396 | + :range: TRUE/FALSE |
397 | + |
398 | +.. note:: |
399 | + This feature depends on atomic op builtins being available. |
400 | + |
401 | |
402 | === removed file 'doc/source/performance/innodb_thread_concurrency_timer_based.rst' |
403 | --- doc/source/performance/innodb_thread_concurrency_timer_based.rst 2011-10-07 23:38:41 +0000 |
404 | +++ doc/source/performance/innodb_thread_concurrency_timer_based.rst 1970-01-01 00:00:00 +0000 |
405 | @@ -1,20 +0,0 @@ |
406 | -.. _innodb_thread_concurrency_timer_based_page: |
407 | - |
408 | -============================================= |
409 | - |InnoDB| timer-based Concurrency Throttling |
410 | -============================================= |
411 | - |
412 | -System Variables |
413 | -================ |
414 | - |
415 | -.. variable:: innodb_thread_concurrency_timer_based |
416 | - |
417 | - :cli: Yes |
418 | - :conf: Yes |
419 | - :scope: |
420 | - :dyn: |
421 | - :vartype: BOOL |
422 | - :default: FALSE |
423 | - :range: TRUE/FALSE |
424 | - |
425 | -Use |InnoDB| timer based concurrency throttling. |
426 | |
427 | === renamed file 'doc/source/performance/query_cache_enhance.rst' => 'doc/source/performance/query_cache_enhance.rst' |
428 | === renamed file 'doc/source/performance/remove_fcntl_excessive_calls.rst' => 'doc/source/performance/remove_fcntl_excessive_calls.rst' |