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

Proposed by Hrvoje Matijakovic on 2014-06-04
Status: Merged
Approved by: Laurynas Biveinis on 2014-06-04
Approved revision: 662
Merged at revision: 667
Proposed branch: lp:~hrvojem/percona-server/bug1325532-5.5
Merge into: lp:percona-server/5.5
Diff against target: 44 lines (+6/-6)
3 files modified
doc/source/diagnostics/process_list.rst (+2/-2)
doc/source/installation/yum_repo.rst (+1/-1)
doc/source/management/udf_percona_toolkit.rst (+3/-3)
To merge this branch: bzr merge lp:~hrvojem/percona-server/bug1325532-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-06-04 Approve on 2014-06-04
Review via email: mp+222051@code.launchpad.net
To post a comment you must log in.
662. By Hrvoje Matijakovic on 2014-06-04

Bugs fixed: Bug #1278566 and DOC-94

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/source/diagnostics/process_list.rst'
2--- doc/source/diagnostics/process_list.rst 2013-05-27 13:46:13 +0000
3+++ doc/source/diagnostics/process_list.rst 2014-06-04 14:34:29 +0000
4@@ -42,7 +42,7 @@
5 :column INFO: The statement that the thread is executing, or NULL if it is not executing any statement.
6 :column TIME_MS: The time in milliseconds that the thread has been in its current state.
7 :column ROWS_EXAMINED: The number of rows examined by the statement being executed.
8- :column ROWS_SENT: The number of rows sent by the statement being executed.
9+ :column ROWS_SENT: The number of rows sent by the statement being executed.
10 :column ROWS_READ: The number of rows read by the statement being executed.
11
12
13@@ -69,4 +69,4 @@
14 | 2 | root | localhost | test | Query | 0 | executing | SELECT * from INFORMATION_SCHEMA.PROCESSLIST | 0 | 0 | 0 | 1 |
15 +------+-----------+-----------+--------+---------+------+------------+----------------------------------------------+----------+---------------+-----------+-----------+
16
17-
18+
19
20=== modified file 'doc/source/installation/yum_repo.rst'
21--- doc/source/installation/yum_repo.rst 2014-05-15 07:37:12 +0000
22+++ doc/source/installation/yum_repo.rst 2014-06-04 14:34:29 +0000
23@@ -86,4 +86,4 @@
24
25 .. rubric:: Footnotes
26
27-.. [#f1] Because there is no official CentOS way to support/get latest OpenSSL on CentOS versions prior to 6.5. Similarly, and also as a result thereof, we decided that there is no official Percona way to support latest |Percona Server| builds on CentOS versions prior to 6.5. Added to this is the fact that many would need to upgrade to OpenSSL 1.0.1g in any case (due to `Heartbleed <http://heartbleed.com>`_ vulnerabilty), and this is not available from any official repo for 6.4 and prior. For any officially unsupported system ``src.rpm`` packages may be used to rebuild |Percona Server| for any environment.
28+.. [#f1] "Current Stable": We support only the current stable RHEL6/CentOS6 release, because there is no official (i.e. RedHat provided) method to support or download the latest OpenSSL on RHEL/CentOS versions prior to 6.5. Similarly, and also as a result thereof, there is no official Percona way to support the latest Percona Server builds on RHEL/CentOS versions prior to 6.5. Additionally, many users will need to upgrade to OpenSSL 1.0.1g or later (due to the `Heartbleed vulnerability <http://www.percona.com/resources/ceo-customer-advisory-heartbleed>`_), and this OpenSSL version is not available for download from any official RHEL/Centos repository for versions 6.4 and prior. For any officially unsupported system, src.rpm packages may be used to rebuild Percona Server for any environment. Please contact our `support service <http://www.percona.com/products/mysql-support>`_ if you require further information on this.
29
30=== modified file 'doc/source/management/udf_percona_toolkit.rst'
31--- doc/source/management/udf_percona_toolkit.rst 2013-10-24 14:12:14 +0000
32+++ doc/source/management/udf_percona_toolkit.rst 2014-06-04 14:34:29 +0000
33@@ -29,9 +29,9 @@
34
35 These UDFs are part of the |Percona Server| packages. To install one of the UDFs into the server, execute one of the following commands, depending on which UDF you want to install: ::
36
37- $ mysql -e "CREATE FUNCTION fnv1a_64 RETURNS INTEGER SONAME ``libfnv1a_udf.so``"
38- $ mysql -e "CREATE FUNCTION fnv_64 RETURNS INTEGER SONAME ``libfnv_udf.so``"
39- $ mysql -e "CREATE FUNCTION murmur_hash RETURNS INTEGER SONAME ``libmurmur_udf.so``"
40+ mysql -e "CREATE FUNCTION fnv1a_64 RETURNS INTEGER SONAME 'libfnv1a_udf.so'"
41+ mysql -e "CREATE FUNCTION fnv_64 RETURNS INTEGER SONAME 'libfnv_udf.so'"
42+ mysql -e "CREATE FUNCTION murmur_hash RETURNS INTEGER SONAME 'libmurmur_udf.so'"
43
44 Executing each of these commands will install its respective UDF into the server.
45

Subscribers

People subscribed via source and target branches