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

Proposed by Hrvoje Matijakovic
Status: Merged
Approved by: Hrvoje Matijakovic
Approved revision: no longer in the source branch.
Merged at revision: 603
Proposed branch: lp:~hrvojem/percona-server/bug1325532-5.6
Merge into: lp:percona-server/5.6
Diff against target: 25 lines (+4/-4)
2 files modified
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.6
Reviewer Review Type Date Requested Status
Hrvoje Matijakovic Approve
Review via email: mp+222056@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Hrvoje Matijakovic (hrvojem) wrote :

Self-approved trivial merge (already approved for 5.1 and 5.5 by Laurynas)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc/source/installation/yum_repo.rst'
--- doc/source/installation/yum_repo.rst 2014-05-15 07:42:55 +0000
+++ doc/source/installation/yum_repo.rst 2014-06-04 15:09:24 +0000
@@ -86,4 +86,4 @@
8686
87.. rubric:: Footnotes87.. rubric:: Footnotes
8888
89.. [#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. 89.. [#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.
9090
=== modified file 'doc/source/management/udf_percona_toolkit.rst'
--- doc/source/management/udf_percona_toolkit.rst 2013-10-24 14:25:51 +0000
+++ doc/source/management/udf_percona_toolkit.rst 2014-06-04 15:09:24 +0000
@@ -29,9 +29,9 @@
2929
30These 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: ::30These 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: ::
3131
32 $ mysql -e "CREATE FUNCTION fnv1a_64 RETURNS INTEGER SONAME ``libfnv1a_udf.so``" 32 mysql -e "CREATE FUNCTION fnv1a_64 RETURNS INTEGER SONAME 'libfnv1a_udf.so'"
33 $ mysql -e "CREATE FUNCTION fnv_64 RETURNS INTEGER SONAME ``libfnv_udf.so``" 33 mysql -e "CREATE FUNCTION fnv_64 RETURNS INTEGER SONAME 'libfnv_udf.so'"
34 $ mysql -e "CREATE FUNCTION murmur_hash RETURNS INTEGER SONAME ``libmurmur_udf.so``"34 mysql -e "CREATE FUNCTION murmur_hash RETURNS INTEGER SONAME 'libmurmur_udf.so'"
3535
36Executing each of these commands will install its respective UDF into the server.36Executing each of these commands will install its respective UDF into the server.
3737

Subscribers

People subscribed via source and target branches