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

Proposed by Hrvoje Matijakovic on 2014-06-04
Status: Merged
Approved by: Laurynas Biveinis on 2014-06-04
Approved revision: 610
Merged at revision: 616
Proposed branch: lp:~hrvojem/percona-server/bug1325532-5.1
Merge into: lp:percona-server/5.1
Diff against target: 208 lines (+36/-31)
5 files modified
doc/source/diagnostics/process_list.rst (+12/-15)
doc/source/diagnostics/slow_extended.rst (+1/-0)
doc/source/installation/yum_repo.rst (+3/-2)
doc/source/management/udf_percona_toolkit.rst (+3/-3)
doc/source/upstream-bug-fixes.rst (+17/-11)
To merge this branch: bzr merge lp:~hrvojem/percona-server/bug1325532-5.1
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-06-04 Approve on 2014-06-04
Review via email: mp+222021@code.launchpad.net
To post a comment you must log in.
review: Approve
611. By Hrvoje Matijakovic on 2014-06-04

Merged with trunk to resolve the conflicts

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 2012-12-13 12:31:02 +0000
3+++ doc/source/diagnostics/process_list.rst 2014-06-04 15:28:27 +0000
4@@ -22,9 +22,6 @@
5 :column STATE: An action, event, or state that indicates what the thread is doing.
6 :column INFO: The statement that the thread is executing, or NULL if it is not executing any statement.
7 :column TIME_MS: The time in milliseconds that the thread has been in its current state.
8- :column ROWS_EXAMINED: The number of rows examined 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 Example Output
14@@ -33,21 +30,21 @@
15 ``SHOW PROCESSLIST`` Command: ::
16
17 mysql> show processlist;
18- +------+-----------+-----------+--------+---------+------+------------+----------------------------------------------+-----------+---------------+-----------+
19- | Id | User | Host | db | Command | Time | State | Info | ROWS_SENT | ROWS_EXAMINED | ROWS_READ |
20- +------+-----------+-----------+--------+---------+------+------------+----------------------------------------------+-----------+---------------+-----------+
21- | 2 | root | localhost | test | Query | 0 | NULL | SHOW PROCESSLIST | 0 | 0 | 1 |
22- | 14 | root | localhost | test | Query | 0 | User lock | SELECT GET_LOCK(``t``,1000) | 0 | 0 | 1 |
23- +------+-----------+-----------+--------+---------+------+------------+----------------------------------------------+-----------+---------------+-----------+
24+ +------+-----------+-----------+--------+---------+------+------------+----------------------------------------------+
25+ | Id | User | Host | db | Command | Time | State | Info |
26+ +------+-----------+-----------+--------+---------+------+------------+----------------------------------------------+
27+ | 2 | root | localhost | test | Query | 0 | NULL | SHOW PROCESSLIST |
28+ | 14 | root | localhost | test | Query | 0 | User lock | SELECT GET_LOCK(``t``,1000) |
29+ +------+-----------+-----------+--------+---------+------+------------+----------------------------------------------+
30
31 Table :table:`PROCESSLIST`: ::
32
33 mysql> select * from information_schema.PROCESSLIST;
34- +------+-----------+-----------+--------+---------+------+------------+----------------------------------------------+----------+---------------+-----------+-----------+
35- | ID | USER | HOST | DB | COMMAND | TIME | STATE | INFO | TIME_MS | ROWS_EXAMINED | ROWS_SENT | ROWS_READ |
36- +------+-----------+-----------+--------+---------+------+------------+----------------------------------------------+----------+---------------+-----------+-----------+
37- | 14 | root | localhost | test | Query | 0 | User lock | SELECT GET_LOCK(``t``,1000) | 1 | 0 | 0 | 1 |
38- | 2 | root | localhost | test | Query | 0 | executing | SELECT * from INFORMATION_SCHEMA.PROCESSLIST | 0 | 0 | 0 | 1 |
39- +------+-----------+-----------+--------+---------+------+------------+----------------------------------------------+----------+---------------+-----------+-----------+
40+ +------+-----------+-----------+--------+---------+------+------------+----------------------------------------------+
41+ | ID | USER | HOST | DB | COMMAND | TIME | STATE | INFO |
42+ +------+-----------+-----------+--------+---------+------+------------+----------------------------------------------+
43+ | 14 | root | localhost | test | Query | 0 | User lock | SELECT GET_LOCK(``t``,1000) |
44+ | 2 | root | localhost | test | Query | 0 | executing | SELECT * from INFORMATION_SCHEMA.PROCESSLIST |
45+ +------+-----------+-----------+--------+---------+------+------------+----------------------------------------------+
46
47
48
49=== modified file 'doc/source/diagnostics/slow_extended.rst'
50--- doc/source/diagnostics/slow_extended.rst 2013-01-15 08:26:36 +0000
51+++ doc/source/diagnostics/slow_extended.rst 2014-06-04 15:28:27 +0000
52@@ -91,6 +91,7 @@
53 :conf: Yes
54 :scope: Global, session
55 :dyn: Yes
56+ :range: 1-ULONG_MAX (either 4294967295 or 18446744073709551615, depending on the platform)
57
58 Specifies that only a fraction of sessions should be logged. Logging is enabled for every nth session. By default, n is 1, so logging is enabled for every session. Rate limiting is disabled for the replication thread.
59
60
61=== modified file 'doc/source/installation/yum_repo.rst'
62--- doc/source/installation/yum_repo.rst 2014-05-14 13:42:20 +0000
63+++ doc/source/installation/yum_repo.rst 2014-06-04 15:28:27 +0000
64@@ -70,7 +70,7 @@
65
66 * *CentOS* 5 and *RHEL* 5
67
68-* *CentOS* 6 and *RHEL* 6 (Current Stable) [#f1]_
69+* *CentOS* 6 and *RHEL* 6 (Current Stable) [#f1]_
70
71 * *Amazon Linux AMI* (works the same as *CentOS* 5)
72
73@@ -86,4 +86,5 @@
74
75 .. rubric:: Footnotes
76
77-.. [#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.
78+.. [#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.
79+
80
81=== modified file 'doc/source/management/udf_percona_toolkit.rst'
82--- doc/source/management/udf_percona_toolkit.rst 2013-10-24 07:48:42 +0000
83+++ doc/source/management/udf_percona_toolkit.rst 2014-06-04 15:28:27 +0000
84@@ -29,9 +29,9 @@
85
86 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: ::
87
88- $ mysql -e "CREATE FUNCTION fnv1a_64 RETURNS INTEGER SONAME ``libfnv1a_udf.so``"
89- $ mysql -e "CREATE FUNCTION fnv_64 RETURNS INTEGER SONAME ``libfnv_udf.so``"
90- $ mysql -e "CREATE FUNCTION murmur_hash RETURNS INTEGER SONAME ``libmurmur_udf.so``"
91+ mysql -e "CREATE FUNCTION fnv1a_64 RETURNS INTEGER SONAME 'libfnv1a_udf.so'"
92+ mysql -e "CREATE FUNCTION fnv_64 RETURNS INTEGER SONAME 'libfnv_udf.so'"
93+ mysql -e "CREATE FUNCTION murmur_hash RETURNS INTEGER SONAME 'libmurmur_udf.so'"
94
95 Executing each of these commands will install its respective UDF into the server.
96
97
98=== modified file 'doc/source/upstream-bug-fixes.rst'
99--- doc/source/upstream-bug-fixes.rst 2014-02-05 10:59:08 +0000
100+++ doc/source/upstream-bug-fixes.rst 2014-06-04 15:28:27 +0000
101@@ -7,7 +7,7 @@
102 +-------------------------------------------------------------------------------------------------------------+
103 |:Upstream bug: :mysqlbug:`69407` - Build warnings with mysql |
104 |:Launchpad bug: :bug:`1244154` |
105-|:Upstream state: Duplicate (checked on 2014-02-05) |
106+|:Upstream state: Duplicate |
107 |:Fix Released: :rn:`5.1.73-14.11` |
108 |:Upstream fix: N/A |
109 +-------------------------------------------------------------------------------------------------------------+
110@@ -25,13 +25,13 @@
111 +-------------------------------------------------------------------------------------------------------------+
112 |:Upstream bug: :mysqlbug:`69379` - MySQL clients return bogus errno for host-not-found errors on Ubuntu 13.04|
113 |:Launchpad bug: :bug:`1186690` |
114-|:Upstream state: Verified (checked on 2014-02-05) |
115+|:Upstream state: Verified (checked on 2014-06-04) |
116 |:Fix Released: :rn:`5.1.69-14.7` |
117 |:Upstream fix: N/A |
118 +-------------------------------------------------------------------------------------------------------------+
119 |:Upstream bug: :mysqlbug:`68116` - InnoDB monitor may hit an assertion error in buf_page_get_gen in debug ...|
120 |:Launchpad bug: :bug:`1100178` |
121-|:Upstream state: Verified (checked on 2014-02-05) |
122+|:Upstream state: Verified (checked on 2014-06-04) |
123 |:Fix Released: :rn:`5.1.67-14.4` |
124 |:Upstream fix: N/A |
125 +-------------------------------------------------------------------------------------------------------------+
126@@ -47,6 +47,12 @@
127 |:Fix Released: :rn:`5.1.67-14.3` |
128 |:Upstream fix: N/A |
129 +-------------------------------------------------------------------------------------------------------------+
130+|:Upstream bug: :mysqlbug:`71603` - file name is not escaped in binlog for LOAD DATA INFILE statement |
131+|:Launchpad bug: :bug:`1277351` |
132+|:Upstream state: N/A |
133+|:Fix Released: :rn:`5.1.66-14.2` |
134+|:Upstream fix: N/A |
135++-------------------------------------------------------------------------------------------------------------+
136 |:Upstream bug: :mysqlbug:`66237` - Temporary files created by binary log cache are not purged after transa...|
137 |:Launchpad bug: :bug:`1070856` |
138 |:Upstream state: Closed |
139@@ -79,13 +85,13 @@
140 +-------------------------------------------------------------------------------------------------------------+
141 |:Upstream bug: :mysqlbug:`61180` - korr/store macros in my_global.h assume the argument to be a char ... |
142 |:Launchpad bug: :bug:`1042517` |
143-|:Upstream state: Verified (checked on 2014-02-05) |
144+|:Upstream state: Closed |
145 |:Fix Released: :rn:`5.1.66-14.1` |
146 |:Upstream fix: N/A |
147 +-------------------------------------------------------------------------------------------------------------+
148 |:Upstream bug: :mysqlbug:`61178` - Incorrect implementation of intersect(ulonglong) in non-optimized Bitmap..|
149 |:Launchpad bug: :bug:`1042517` |
150-|:Upstream state: Verified (checked on 2014-02-05) |
151+|:Upstream state: Verified (checked on 2014-06-04) |
152 |:Fix Released: :rn:`5.1.66-14.1` |
153 |:Upstream fix: N/A |
154 +-------------------------------------------------------------------------------------------------------------+
155@@ -139,7 +145,7 @@
156 +-------------------------------------------------------------------------------------------------------------+
157 |:Upstream bug: :mysqlbug:`64127` - MTR --warnings option misses some of InnoDB errors and warnings |
158 |:Launchpad bug: :bug:`937859` |
159-|:Upstream state: Verified (checked on 2014-02-05) |
160+|:Upstream state: Verified (checked on 2014-06-04) |
161 |:Fix Released: :rn:`5.1.62-13.3` |
162 |:Upstream fix: N/A |
163 +-------------------------------------------------------------------------------------------------------------+
164@@ -163,7 +169,7 @@
165 +-------------------------------------------------------------------------------------------------------------+
166 |:Upstream bug: :mysqlbug:`62516` - Fast index creation does not update index statistics |
167 |:Launchpad bug: :bug:`857590` |
168-|:Upstream state: Verified (checked on 2014-02-05) |
169+|:Upstream state: Verified (checked on 2014-06-04) |
170 |:Fix Released: :rn:`5.1.59-13.0` |
171 |:Upstream fix: N/A |
172 +-------------------------------------------------------------------------------------------------------------+
173@@ -187,7 +193,7 @@
174 +-------------------------------------------------------------------------------------------------------------+
175 |:Upstream bug: :mysqlbug:`71183` - os_file_fsync() should handle fsync() returning EINTR |
176 |:Launchpad bug: :bug:`1262651` |
177-|:Upstream state: Verified (checked on 2014-02-05) |
178+|:Upstream state: Verified (checked on 2014-06-04) |
179 |:Fix Released: :rn:`5.1.56-12.7` |
180 |:Upstream fix: N/A |
181 +-------------------------------------------------------------------------------------------------------------+
182@@ -229,7 +235,7 @@
183 +-------------------------------------------------------------------------------------------------------------+
184 |:Upstream bug: :mysqlbug:`55032` - Query cache sometime insert queries to cache, but doesn't find ... |
185 |:Launchpad bug: none |
186-|:Upstream state: Verified (checked on 2014-02-05) |
187+|:Upstream state: Verified (checked on 2014-06-04) |
188 |:Fix Released: :rn:`5.1.47-rel11.2` |
189 |:Upstream fix: N/A |
190 +-------------------------------------------------------------------------------------------------------------+
191@@ -277,7 +283,7 @@
192 +-------------------------------------------------------------------------------------------------------------+
193 |:Upstream bug: :mysqlbug:`44140` - Insert buffer operation may destroy the page during its recovery process |
194 |:Launchpad bug: none |
195-|:Upstream state: Open (checked on 2014-02-05) |
196+|:Upstream state: Won't fix |
197 |:Fix Released: :rn:`1.0.3-7` |
198 |:Upstream fix: N/A |
199 +-------------------------------------------------------------------------------------------------------------+
200@@ -289,7 +295,7 @@
201 +-------------------------------------------------------------------------------------------------------------+
202 |:Upstream bug: :mysqlbug:`20001` - Support for temp-tables in INFORMATION_SCHEMA |
203 |:Launchpad bug: none |
204-|:Upstream state: Verified (checked on 2014-02-05) |
205+|:Upstream state: Verified (checked on 2014-06-04) |
206 |:Fix Released: :rn:`1.0.3-7` |
207 |:Upstream fix: N/A |
208 +-------------------------------------------------------------------------------------------------------------+

Subscribers

People subscribed via source and target branches