Merge lp:~hrvojem/percona-server/rn-5.1.72-14.10-5.6 into lp:percona-server/5.6

Proposed by Hrvoje Matijakovic
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 487
Proposed branch: lp:~hrvojem/percona-server/rn-5.1.72-14.10-5.6
Merge into: lp:percona-server/5.6
Diff against target: 73 lines (+13/-17)
3 files modified
doc/source/flexibility/log_warnings_suppress.rst (+1/-1)
doc/source/management/udf_percona_toolkit.rst (+11/-15)
doc/source/release-notes/Percona-Server-5.6.13-61.0.rst (+1/-1)
To merge this branch: bzr merge lp:~hrvojem/percona-server/rn-5.1.72-14.10-5.6
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+192518@code.launchpad.net
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
=== modified file 'doc/source/flexibility/log_warnings_suppress.rst'
--- doc/source/flexibility/log_warnings_suppress.rst 2013-07-05 07:28:34 +0000
+++ doc/source/flexibility/log_warnings_suppress.rst 2013-10-24 14:41:44 +0000
@@ -4,7 +4,7 @@
4 Suppress Warning Messages4 Suppress Warning Messages
5===========================5===========================
66
7This feature is intended to provide a general mechanism (using ``log_warnings_silence``) to disable certain warning messages to the log file. Currently, it is only implemented for disabling message #1592 warnings.7This feature is intended to provide a general mechanism (using ``log_warnings_silence``) to disable certain warning messages to the log file. Currently, it is only implemented for disabling message #1592 warnings. This feature does not influence warnings delivered to a client.
88
99
10Version Specific Information10Version Specific Information
1111
=== modified file 'doc/source/management/udf_percona_toolkit.rst'
--- doc/source/management/udf_percona_toolkit.rst 2013-06-06 03:44:00 +0000
+++ doc/source/management/udf_percona_toolkit.rst 2013-10-24 14:41:44 +0000
@@ -6,17 +6,17 @@
66
7Three *Percona Toolkit* UDFs that provide faster checksums are provided:7Three *Percona Toolkit* UDFs that provide faster checksums are provided:
88
9 * ``fnv_udf``9 * ``libfnv1a_udf``
1010
11 * ``fnv1a_udf``11 * ``libfnv_udf``
1212
13 * ``murmur_udf``13 * ``libmurmur_udf``
1414
15Version Specific Information15Version Specific Information
16============================16============================
1717
18 * :rn:`5.6.11-60.3`:18 * :rn:`5.6.11-60.3`:
19 Began distributing ``fnv_udf``, ``fnv1a_udf``, and ``murmur_udf``.19 Began distributing ``libfnv1a_udf``, ``libfnv_udf``, and ``libmurmur_udf``.
2020
21Other Information21Other Information
22=================22=================
@@ -27,15 +27,11 @@
27Installation27Installation
28============28============
2929
30Use of the Percona Software Repositories simplifies the installation of *Percona Toolkit*. Once the repository has been set up on your system, *Percona Toolkit* can be installed by executing: ::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 $ yum install percona-toolkit32 $ mysql -e "CREATE FUNCTION fnv1a_64 RETURNS INTEGER SONAME ``libfnv1a_udf.so``"
3333 $ mysql -e "CREATE FUNCTION fnv_64 RETURNS INTEGER SONAME ``libfnv_udf.so``"
34This will place the *Percona Toolkit* UDFs onto your system. However, they will not yet be installed into the |MySQL| server. To install one of the UDF``s into the server, execute one of the following commands, depending on which UDF you want to install: ::34 $ mysql -e "CREATE FUNCTION murmur_hash RETURNS INTEGER SONAME ``libmurmur_udf.so``"
35
36 $ mysql -e "CREATE FUNCTION fnv_64 RETURNS INTEGER SONAME ``fnv_udf.so``"
37 $ mysql -e "CREATE FUNCTION fnv1a_64 RETURNS INTEGER SONAME ``fnv1a_udf.so``"
38 $ mysql -e "CREATE FUNCTION murmur_hash RETURNS INTEGER SONAME ``murmur_udf.so``"
3935
40Executing 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.
4137
4238
=== modified file 'doc/source/release-notes/Percona-Server-5.6.13-61.0.rst'
--- doc/source/release-notes/Percona-Server-5.6.13-61.0.rst 2013-10-24 09:04:33 +0000
+++ doc/source/release-notes/Percona-Server-5.6.13-61.0.rst 2013-10-24 14:41:44 +0000
@@ -24,7 +24,7 @@
24Bugs Fixed24Bugs Fixed
25==========25==========
2626
27 Due to an incompatible upstream change that went in unnoticed, the page cleaner thread would attempt to replay any file operations it encountered. In most cases this were a no-op, but there were race conditions for certain DDL operations that would have resulted in server crash. Bug fixed :bug:`1217002`.27 Due to an incompatible upstream change that went in unnoticed, the log tracker thread would attempt to replay any file operations it encountered. In most cases this were a no-op, but there were race conditions for certain DDL operations that would have resulted in server crash. Bug fixed :bug:`1217002`.
2828
29 ``apt-get upgrade`` of |Percona Server| would fail in post-installation step if server failed to start. Bug fixed :bug:`1002500`.29 ``apt-get upgrade`` of |Percona Server| would fail in post-installation step if server failed to start. Bug fixed :bug:`1002500`.
3030

Subscribers

People subscribed via source and target branches