Merge lp:~percona-dev/percona-server/release-5.1.53-12-slow_extended-fix into lp:~percona-dev/percona-server/release-5.1.53

Proposed by Oleg Tsarev on 2010-12-17
Status: Rejected
Rejected by: Alexey Kopytov on 2010-12-20
Proposed branch: lp:~percona-dev/percona-server/release-5.1.53-12-slow_extended-fix
Merge into: lp:~percona-dev/percona-server/release-5.1.53
Diff against target: 547 lines (+126/-28)
32 files modified
control_online_alter_index.patch (+1/-1)
microsec_process.patch (+1/-1)
mysql-test/slow_extended.patch/percona_slow_extended-combined-master.opt (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-combined.result (+18/-0)
mysql-test/slow_extended.patch/percona_slow_extended-combined.test (+6/-0)
mysql-test/slow_extended.patch/percona_slow_extended-combined2-master.opt (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-combined2.result (+12/-0)
mysql-test/slow_extended.patch/percona_slow_extended-combined2.test (+4/-0)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl-master.opt (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.result (+3/-0)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.test (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl-master.opt (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.result (+3/-0)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.test (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl-master.opt (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.result (+9/-0)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.test (+3/-0)
mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test (+2/-2)
mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test (+2/-2)
mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl-master.opt (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.result (+3/-0)
mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.test (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl-master.opt (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.result (+3/-0)
mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.test (+1/-0)
optimizer_fix.patch (+1/-1)
profiling_slow.patch (+11/-2)
query_cache_enhance.patch (+6/-6)
response-time-distribution.patch (+2/-2)
slow_extended.patch (+23/-9)
suppress_log_warning_1592.patch (+1/-1)
userstat.patch (+1/-1)
To merge this branch: bzr merge lp:~percona-dev/percona-server/release-5.1.53-12-slow_extended-fix
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2010-12-17 Disapprove on 2010-12-20
Review via email: mp+44089@code.launchpad.net

This proposal supersedes a proposal from 2010-12-17.

Description of the Change

1) Improve tests for slow_extended
2) Update infrastructure scripts
3) Remove unnecessary test for show_slave_status_nolock.patch
4) fix bug #691234
5) fix bug #688643
6) Fixed tests for slow_extended.patch - replace "cat ./var/..." to "cat $MYSQLTEST_VARDIR/..." (critical for out-source build)
----------------------------------------
bool variables in mysql can be used without argument in command-line and config.
Example:
--use_global_long_query_time

Variables what can be used without argument named "optional".
Bug #691234 provocated by "required" type of variable - as result,

--use_global_long_query_time --log_slow_verbosity="full"

interpreted as:
use_global_long_query_time="--log_slow_berbosity=\"full\""

as effect:
use_global_long_query_time=0 and log_slow_verbosity not setuped
----------------------------------------
Command-line options update different from update system_variables.
Bug #668643 provocated by different update way for use_global_long_query_time

I fixed this thought share the update to command-line option

To post a comment you must log in.
Alexey Kopytov (akopytov) wrote :

Oleg, please don't be lazy and create separate MPs for every change or bugfix you would like to push.

When reviewing a MP, I would like to see the following:

1) Description of the problem being fixed by the patch I'm looking at.
2) Description of the way the patch addresses the problem (if it's not obvious)
3) The patch itself.

What I see instead is a bunch of changesets like this:

--- cut ---
178. By Oleg Tsarev on 2010-12-17

    bzr merge lp:~percona-dev/percona-server/release-5.1.53-slow_extended
177. By Oleg Tsarev on 2010-12-17

    fix new line carrets
176. By Oleg Tsarev on 2010-12-17

    fix new line carrets
175. By Oleg Tsarev on 2010-12-17

    1) Improve tests for slow_extended
    2) Update infrastructure scripts
    3) Remove unnecessary test for show_slave_status_nolock.patch
    4) fix bug #691234
    5) fix bug #688643
--- cut ---

Then there is a bunch of changes in both code and test files. So I have to figure out which change correspond to which changeset *and* item from that changeset ("is this supposed to fix bug #691234 or bug #677643?"). Then I have to figure out the actual problem, because, believe it or not, a description like "Bug #668643 provocated by different update way for use_global_long_query_time" does NOT really describe anything. So I have to go read the bug report, figure out the problem, then look at your change again and make guesses about the proposed way to fix that problem.

This is _very_ time consuming. Please save me a few hours by just structuring your changes appropriately.

review: Disapprove

Unmerged revisions

178. By Oleg Tsarev on 2010-12-17

bzr merge lp:~percona-dev/percona-server/release-5.1.53-slow_extended

177. By Oleg Tsarev on 2010-12-17

fix new line carrets

176. By Oleg Tsarev on 2010-12-17

fix new line carrets

175. By Oleg Tsarev on 2010-12-17

1) Improve tests for slow_extended
2) Update infrastructure scripts
3) Remove unnecessary test for show_slave_status_nolock.patch
4) fix bug #691234
5) fix bug #688643

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'control_online_alter_index.patch'
2--- control_online_alter_index.patch 2010-11-16 13:48:48 +0000
3+++ control_online_alter_index.patch 2010-12-17 19:11:56 +0000
4@@ -56,7 +56,7 @@
5 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
6 --- a/sql/set_var.cc 2010-07-21 22:49:54.019529438 +0900
7 +++ b/sql/set_var.cc 2010-07-21 22:50:24.122532110 +0900
8-@@ -747,6 +747,11 @@
9+@@ -748,6 +748,11 @@
10 sys_engine_condition_pushdown(&vars, "engine_condition_pushdown",
11 &SV::engine_condition_pushdown);
12
13
14=== modified file 'microsec_process.patch'
15--- microsec_process.patch 2010-08-27 10:03:57 +0000
16+++ microsec_process.patch 2010-12-17 19:11:56 +0000
17@@ -5,7 +5,7 @@
18 #!!! notice !!!
19 # Any small change to this file in the main branch
20 # should be done or reviewed by the maintainer!
21-diff -ruN a/patch_info/microsec_process.info b/patch_info/microsec_process.info
22+diff -ruN /dev/null b/patch_info/microsec_process.info
23 --- /dev/null 1970-01-01 09:00:00.000000000 +0900
24 +++ b/patch_info/microsec_process.info 2010-08-27 14:45:52.941058849 +0900
25 @@ -0,0 +1,8 @@
26
27=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-combined-master.opt'
28--- mysql-test/slow_extended.patch/percona_slow_extended-combined-master.opt 1970-01-01 00:00:00 +0000
29+++ mysql-test/slow_extended.patch/percona_slow_extended-combined-master.opt 2010-12-17 19:11:56 +0000
30@@ -0,0 +1,1 @@
31+--use_global_long_query_time --log_slow_verbosity="full"
32
33=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-combined.result'
34--- mysql-test/slow_extended.patch/percona_slow_extended-combined.result 1970-01-01 00:00:00 +0000
35+++ mysql-test/slow_extended.patch/percona_slow_extended-combined.result 2010-12-17 19:11:56 +0000
36@@ -0,0 +1,18 @@
37+show variables like 'use_global_long_query_time';
38+Variable_name Value
39+use_global_long_query_time ON
40+show variables like 'use_global_log_slow_control';
41+Variable_name Value
42+use_global_log_slow_control long_query_time
43+show variables like 'log_slow_verbosity';
44+Variable_name Value
45+log_slow_verbosity microtime,query_plan,innodb
46+show global variables like 'use_global_long_query_time';
47+Variable_name Value
48+use_global_long_query_time ON
49+show global variables like 'log_slow_verbosity';
50+Variable_name Value
51+log_slow_verbosity microtime,query_plan,innodb
52+show global variables like 'use_global_log_slow_control';
53+Variable_name Value
54+use_global_log_slow_control long_query_time
55
56=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-combined.test'
57--- mysql-test/slow_extended.patch/percona_slow_extended-combined.test 1970-01-01 00:00:00 +0000
58+++ mysql-test/slow_extended.patch/percona_slow_extended-combined.test 2010-12-17 19:11:56 +0000
59@@ -0,0 +1,6 @@
60+show variables like 'use_global_long_query_time';
61+show variables like 'use_global_log_slow_control';
62+show variables like 'log_slow_verbosity';
63+show global variables like 'use_global_long_query_time';
64+show global variables like 'log_slow_verbosity';
65+show global variables like 'use_global_log_slow_control';
66
67=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-combined2-master.opt'
68--- mysql-test/slow_extended.patch/percona_slow_extended-combined2-master.opt 1970-01-01 00:00:00 +0000
69+++ mysql-test/slow_extended.patch/percona_slow_extended-combined2-master.opt 2010-12-17 19:11:56 +0000
70@@ -0,0 +1,1 @@
71+--use_global_log_slow_control="long_query_time"
72
73=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-combined2.result'
74--- mysql-test/slow_extended.patch/percona_slow_extended-combined2.result 1970-01-01 00:00:00 +0000
75+++ mysql-test/slow_extended.patch/percona_slow_extended-combined2.result 2010-12-17 19:11:56 +0000
76@@ -0,0 +1,12 @@
77+show variables like 'use_global_long_query_time';
78+Variable_name Value
79+use_global_long_query_time ON
80+show variables like 'use_global_log_slow_control';
81+Variable_name Value
82+use_global_log_slow_control long_query_time
83+show global variables like 'use_global_long_query_time';
84+Variable_name Value
85+use_global_long_query_time ON
86+show global variables like 'use_global_log_slow_control';
87+Variable_name Value
88+use_global_log_slow_control long_query_time
89
90=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-combined2.test'
91--- mysql-test/slow_extended.patch/percona_slow_extended-combined2.test 1970-01-01 00:00:00 +0000
92+++ mysql-test/slow_extended.patch/percona_slow_extended-combined2.test 2010-12-17 19:11:56 +0000
93@@ -0,0 +1,4 @@
94+show variables like 'use_global_long_query_time';
95+show variables like 'use_global_log_slow_control';
96+show global variables like 'use_global_long_query_time';
97+show global variables like 'use_global_log_slow_control';
98
99=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl-master.opt'
100--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl-master.opt 1970-01-01 00:00:00 +0000
101+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl-master.opt 2010-12-17 19:11:56 +0000
102@@ -0,0 +1,1 @@
103+--log_slow_sp_statements
104
105=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.result'
106--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.result 1970-01-01 00:00:00 +0000
107+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.result 2010-12-17 19:11:56 +0000
108@@ -0,0 +1,3 @@
109+show global variables like 'log_slow_sp_statements';
110+Variable_name Value
111+log_slow_sp_statements ON
112
113=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.test'
114--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.test 1970-01-01 00:00:00 +0000
115+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.test 2010-12-17 19:11:56 +0000
116@@ -0,0 +1,1 @@
117+show global variables like 'log_slow_sp_statements';
118
119=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl-master.opt'
120--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl-master.opt 1970-01-01 00:00:00 +0000
121+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl-master.opt 2010-12-17 19:11:56 +0000
122@@ -0,0 +1,1 @@
123+--log_slow_timestamp_every
124
125=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.result'
126--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.result 1970-01-01 00:00:00 +0000
127+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.result 2010-12-17 19:11:56 +0000
128@@ -0,0 +1,3 @@
129+show global variables like 'log_slow_timestamp_every';
130+Variable_name Value
131+log_slow_timestamp_every ON
132
133=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.test'
134--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.test 1970-01-01 00:00:00 +0000
135+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.test 2010-12-17 19:11:56 +0000
136@@ -0,0 +1,1 @@
137+show global variables like 'log_slow_timestamp_every';
138
139=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl-master.opt'
140--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl-master.opt 1970-01-01 00:00:00 +0000
141+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl-master.opt 2010-12-17 19:11:56 +0000
142@@ -0,0 +1,1 @@
143+--log_slow_verbosity="full"
144
145=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.result'
146--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.result 1970-01-01 00:00:00 +0000
147+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.result 2010-12-17 19:11:56 +0000
148@@ -0,0 +1,9 @@
149+show global variables like 'log_slow_verbosity';
150+Variable_name Value
151+log_slow_verbosity microtime,query_plan,innodb
152+show variables like 'log_slow_verbosity';
153+Variable_name Value
154+log_slow_verbosity microtime,query_plan,innodb
155+select @@log_slow_verbosity;
156+@@log_slow_verbosity
157+microtime,query_plan,innodb
158
159=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.test'
160--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.test 1970-01-01 00:00:00 +0000
161+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.test 2010-12-17 19:11:56 +0000
162@@ -0,0 +1,3 @@
163+show global variables like 'log_slow_verbosity';
164+show variables like 'log_slow_verbosity';
165+select @@log_slow_verbosity;
166
167=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test'
168--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test 2010-11-18 11:47:03 +0000
169+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test 2010-12-17 19:11:56 +0000
170@@ -78,7 +78,7 @@
171 -- echo # Analyse master slow_query_log
172 let $i=5;
173 let $k=1;
174-let $cmd=cat ./var/mysqld.1/data/percona_log_slow_slave_statements-master.log | grep;
175+let $cmd=cat $MYSQLTEST_VARDIR/mysqld.1/data/percona_log_slow_slave_statements-master.log | grep;
176 while($i)
177 {
178 let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
179@@ -90,7 +90,7 @@
180 -- echo # Analyse slave slow_query_log
181 let $i=5;
182 let $k=1;
183-let $cmd=cat ./var/mysqld.2/data/percona_log_slow_slave_statements-slave.log | grep;
184+let $cmd=cat $MYSQLTEST_VARDIR/mysqld.2/data/percona_log_slow_slave_statements-slave.log | grep;
185 while($i)
186 {
187 let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
188
189=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test'
190--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test 2010-11-18 12:19:15 +0000
191+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test 2010-12-17 19:11:56 +0000
192@@ -125,7 +125,7 @@
193 -- echo # Analyse master slow_query_log
194 let $i=7;
195 let $k=1;
196-let $cmd=cat ./var/mysqld.1/data/percona_log_slow_slave_statements-master.log | grep;
197+let $cmd=cat $MYSQLTEST_VARDIR/mysqld.1/data/percona_log_slow_slave_statements-master.log | grep;
198 while($i)
199 {
200 let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
201@@ -137,7 +137,7 @@
202 -- echo # Analyse slave slow_query_log
203 let $i=7;
204 let $k=1;
205-let $cmd=cat ./var/mysqld.2/data/percona_log_slow_slave_statements-slave.log | grep;
206+let $cmd=cat $MYSQLTEST_VARDIR/mysqld.2/data/percona_log_slow_slave_statements-slave.log | grep;
207 while($i)
208 {
209 let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
210
211=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl-master.opt'
212--- mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl-master.opt 1970-01-01 00:00:00 +0000
213+++ mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl-master.opt 2010-12-17 19:11:56 +0000
214@@ -0,0 +1,1 @@
215+--slow_query_log_microseconds_timestamp
216
217=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.result'
218--- mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.result 1970-01-01 00:00:00 +0000
219+++ mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.result 2010-12-17 19:11:56 +0000
220@@ -0,0 +1,3 @@
221+show global variables like 'slow_query_log_microseconds_timestamp';
222+Variable_name Value
223+slow_query_log_microseconds_timestamp ON
224
225=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.test'
226--- mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.test 1970-01-01 00:00:00 +0000
227+++ mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.test 2010-12-17 19:11:56 +0000
228@@ -0,0 +1,1 @@
229+show global variables like 'slow_query_log_microseconds_timestamp';
230
231=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl-master.opt'
232--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl-master.opt 1970-01-01 00:00:00 +0000
233+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl-master.opt 2010-12-17 19:11:56 +0000
234@@ -0,0 +1,1 @@
235+--use_global_long_query_time
236
237=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.result'
238--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.result 1970-01-01 00:00:00 +0000
239+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.result 2010-12-17 19:11:56 +0000
240@@ -0,0 +1,3 @@
241+show global variables like 'use_global_long_query_time';
242+Variable_name Value
243+use_global_long_query_time ON
244
245=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.test'
246--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.test 1970-01-01 00:00:00 +0000
247+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.test 2010-12-17 19:11:56 +0000
248@@ -0,0 +1,1 @@
249+show global variables like 'use_global_long_query_time';
250
251=== modified file 'optimizer_fix.patch'
252--- optimizer_fix.patch 2010-11-25 10:17:50 +0000
253+++ optimizer_fix.patch 2010-12-17 19:11:56 +0000
254@@ -148,7 +148,7 @@
255 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
256 --- a/sql/set_var.cc 2010-07-26 18:29:12.250113584 +0900
257 +++ b/sql/set_var.cc 2010-07-26 18:29:35.724113196 +0900
258-@@ -560,6 +560,8 @@
259+@@ -561,6 +561,8 @@
260 &opt_userstat_running);
261 static sys_var_bool_ptr sys_thread_statistics(&vars, "thread_statistics",
262 &opt_thread_statistics);
263
264=== modified file 'profiling_slow.patch'
265--- profiling_slow.patch 2010-12-13 17:52:47 +0000
266+++ profiling_slow.patch 2010-12-17 19:11:56 +0000
267@@ -5,6 +5,7 @@
268 #!!! notice !!!
269 # Any small change to this file in the main branch
270 # should be done or reviewed by the maintainer!
271+diff -ruN /dev/null b/mysql-test/r/percona_bug643149.result
272 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
273 +++ b/mysql-test/r/percona_bug643149.result 2010-11-25 23:52:28.000000000 +0300
274 @@ -0,0 +1,16 @@
275@@ -24,9 +25,10 @@
276 +# Profile_starting: X.X Profile_starting_cpu: X.X Profile_checking_permissions: X.X Profile_checking_permissions_cpu: X.X Profile_Opening_tables: X.X Profile_Opening_tables_cpu: X.X Profile_init: X.X Profile_init_cpu: X.X Profile_optimizing: X.X Profile_optimizing_cpu: X.X Profile_executing: X.X Profile_executing_cpu: X.X Profile_User_sleep: X.X Profile_User_sleep_cpu: X.X Profile_end: X.X Profile_end_cpu: X.X Profile_query_end: X.X Profile_query_end_cpu: X.X Profile_freeing_items: X.X Profile_freeing_items_cpu: X.X Profile_logging_slow_query: X.X Profile_logging_slow_query_cpu: X.X
277 +# Profile_total: X.X Profile_total_cpu: X.X
278 +SET GLOBAL slow_query_log_file=@old_slow_query_log_file;
279+diff -ruN /dev/null b/mysql-test/t/percona_bug643149.test
280 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
281 +++ b/mysql-test/t/percona_bug643149.test 2010-11-25 23:52:08.000000000 +0300
282-@@ -0,0 +1,47 @@
283+@@ -0,0 +1,50 @@
284 +#
285 +# This test suffers from server
286 +# Bug#38124 "general_log_file" variable silently unset when using expression
287@@ -77,6 +79,7 @@
288 + eval SET @@global.slow_query_log_file = '$my_var';
289 + --enable_query_log
290 +}
291+diff -ruN /dev/null b/patch_info/profiling_slow.info
292 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
293 +++ b/patch_info/profiling_slow.info 2010-11-24 19:33:02.000000000 +0300
294 @@ -0,0 +1,9 @@
295@@ -89,6 +92,7 @@
296 +Changelog
297 +2009-05-18
298 +Initial implementation
299+diff -ruN a/sql/log.cc b/sql/log.cc
300 --- a/sql/log.cc 2010-11-24 19:33:02.000000000 +0300
301 +++ b/sql/log.cc 2010-11-24 19:36:29.000000000 +0300
302 @@ -2433,6 +2433,11 @@
303@@ -103,6 +107,7 @@
304 if (thd->db && strcmp(thd->db, db))
305 { // Database changed
306 if (my_b_printf(&log_file,"use %s;\n",thd->db) == (uint) -1)
307+diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
308 --- a/sql/mysqld.cc 2010-11-24 19:33:02.000000000 +0300
309 +++ b/sql/mysqld.cc 2010-11-24 19:36:29.000000000 +0300
310 @@ -5778,6 +5778,8 @@
311@@ -131,9 +136,10 @@
312 #endif
313 {"relay-log", OPT_RELAY_LOG,
314 "The location and name to use for relay logs.",
315+diff -ruN a/sql/set_var.cc b/sql/set_var.cc
316 --- a/sql/set_var.cc 2010-11-24 19:33:02.000000000 +0300
317 +++ b/sql/set_var.cc 2010-11-24 19:36:29.000000000 +0300
318-@@ -847,6 +847,10 @@
319+@@ -848,6 +848,10 @@
320 ulonglong(OPTION_PROFILING));
321 static sys_var_thd_ulong sys_profiling_history_size(&vars, "profiling_history_size",
322 &SV::profiling_history_size);
323@@ -144,6 +150,7 @@
324 #endif
325
326 /* Local state variables */
327+diff -ruN a/sql/sql_class.h b/sql/sql_class.h
328 --- a/sql/sql_class.h 2010-11-24 19:33:02.000000000 +0300
329 +++ b/sql/sql_class.h 2010-11-24 19:36:29.000000000 +0300
330 @@ -328,6 +328,8 @@
331@@ -155,6 +162,7 @@
332 ulong query_cache_type;
333 ulong read_buff_size;
334 ulong read_rnd_buff_size;
335+diff -ruN a/sql/sql_profile.cc b/sql/sql_profile.cc
336 --- a/sql/sql_profile.cc 2010-10-12 00:34:33.000000000 +0400
337 +++ b/sql/sql_profile.cc 2010-11-25 16:09:12.000000000 +0300
338 @@ -223,8 +223,22 @@
339@@ -319,6 +327,7 @@
340 /**
341 Fill the information schema table, "query_profile", as defined in show.cc .
342 There are two ways to get to this function: Selecting from the information
343+diff -ruN a/sql/sql_profile.h b/sql/sql_profile.h
344 --- a/sql/sql_profile.h 2010-10-12 00:34:33.000000000 +0400
345 +++ b/sql/sql_profile.h 2010-11-25 15:54:48.000000000 +0300
346 @@ -165,11 +165,15 @@
347
348=== modified file 'query_cache_enhance.patch'
349--- query_cache_enhance.patch 2010-11-26 11:54:21 +0000
350+++ query_cache_enhance.patch 2010-12-17 19:11:56 +0000
351@@ -119,7 +119,7 @@
352 static void fix_myisam_max_sort_file_size(THD *thd, enum_var_type type);
353 static void fix_max_binlog_size(THD *thd, enum_var_type type);
354 static void fix_max_relay_log_size(THD *thd, enum_var_type type);
355-@@ -570,9 +572,6 @@
356+@@ -571,9 +573,6 @@
357 &SV::div_precincrement);
358 static sys_var_long_ptr sys_rpl_recovery_rank(&vars, "rpl_recovery_rank",
359 &rpl_recovery_rank);
360@@ -129,7 +129,7 @@
361
362 static sys_var_thd_ulong sys_range_alloc_block_size(&vars, "range_alloc_block_size",
363 &SV::range_alloc_block_size);
364-@@ -638,14 +637,20 @@
365+@@ -639,14 +638,20 @@
366 NULL);
367
368 #ifdef HAVE_QUERY_CACHE
369@@ -155,7 +155,7 @@
370 static sys_var_thd_bool
371 sys_query_cache_wlock_invalidate(&vars, "query_cache_wlock_invalidate",
372 &SV::query_cache_wlock_invalidate);
373-@@ -929,6 +934,8 @@
374+@@ -930,6 +935,8 @@
375 #ifndef EMBEDDED_LIBRARY
376 static sys_var_const_str_ptr sys_repl_report_host(&vars, "report_host", &report_host);
377 static sys_var_const_str_ptr sys_repl_report_user(&vars, "report_user", &report_user);
378@@ -164,7 +164,7 @@
379 static sys_var_const_str_ptr sys_repl_report_password(&vars, "report_password", &report_password);
380
381 static uchar *slave_get_report_port(THD *thd)
382-@@ -1239,10 +1246,9 @@
383+@@ -1240,10 +1247,9 @@
384 {}
385 #endif /* HAVE_REPLICATION */
386
387@@ -176,7 +176,7 @@
388 ulong new_cache_size= query_cache.resize(query_cache_size);
389
390 /*
391-@@ -1256,11 +1262,35 @@
392+@@ -1257,11 +1263,35 @@
393 query_cache_size, new_cache_size);
394
395 query_cache_size= new_cache_size;
396@@ -214,7 +214,7 @@
397 static void fix_query_cache_min_res_unit(THD *thd, enum_var_type type)
398 {
399 query_cache_min_res_unit=
400-@@ -3634,6 +3664,16 @@
401+@@ -3635,6 +3665,16 @@
402 Functions to handle SET mysql_internal_variable=const_expr
403 *****************************************************************************/
404
405
406=== modified file 'response-time-distribution.patch'
407--- response-time-distribution.patch 2010-12-15 13:13:13 +0000
408+++ response-time-distribution.patch 2010-12-17 19:11:56 +0000
409@@ -186,7 +186,7 @@
410 @@ -6969,6 +6985,23 @@
411 "Use microsecond time's precision in slow query log",
412 (uchar**) &opt_slow_query_log_microseconds_timestamp, (uchar**) &opt_slow_query_log_microseconds_timestamp,
413- 0, GET_BOOL, REQUIRED_ARG, 0, 0, 1, 0, 1, 0},
414+ 0, GET_BOOL, OPT_ARG, 0, 0, 1, 0, 1, 0},
415 +#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
416 + {"query_response_time_range_base", OPT_QRT_RANGE_BASE,
417 + "Select base of log for query_response_time ranges. WARNING: variable change affect only after flush",
418@@ -670,7 +670,7 @@
419 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
420 --- a/sql/set_var.cc 2010-11-01 08:43:57.000000000 +0000
421 +++ b/sql/set_var.cc 2010-11-01 08:52:40.000000000 +0000
422-@@ -1006,6 +1006,14 @@
423+@@ -1007,6 +1007,14 @@
424 static sys_var_use_global_long_query_time sys_use_global_long_query_time;
425 static sys_var_bool_ptr sys_slow_query_log_microseconds_timestamp(&vars, "slow_query_log_microseconds_timestamp",
426 &opt_slow_query_log_microseconds_timestamp);
427
428=== modified file 'slow_extended.patch'
429--- slow_extended.patch 2010-11-26 11:54:21 +0000
430+++ slow_extended.patch 2010-12-17 19:11:56 +0000
431@@ -611,22 +611,22 @@
432 + {"log_slow_sp_statements", OPT_LOG_SLOW_SP_STATEMENTS,
433 + "Log slow statements executed by stored procedure to the slow log if it is open.",
434 + (uchar**) &opt_log_slow_sp_statements, (uchar**) &opt_log_slow_sp_statements,
435-+ 0, GET_BOOL, REQUIRED_ARG, 1, 0, 1, 0, 1, 0},
436++ 0, GET_BOOL, OPT_ARG, 1, 0, 1, 0, 1, 0},
437 + {"log_slow_timestamp_every", OPT_LOG_SLOW_TIMESTAMP_EVERY,
438 + "Timestamp is printed for all records of the slow log even if they are same time.",
439 + (uchar**) &opt_log_slow_timestamp_every, (uchar**) &opt_log_slow_timestamp_every,
440-+ 0, GET_BOOL, REQUIRED_ARG, 0, 0, 1, 0, 1, 0},
441++ 0, GET_BOOL, OPT_ARG, 0, 0, 1, 0, 1, 0},
442 + {"use_global_log_slow_control", OPT_USE_GLOBAL_LOG_SLOW_CONTROL,
443 + "Choose flags, wich always use the global variables. Multiple flags allowed in a comma-separated string. [none, log_slow_filter, log_slow_rate_limit, log_slow_verbosity, long_query_time, min_examined_row_limit, all]",
444 + 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, SLOG_UG_NONE, 0, 0},
445 + {"use_global_long_query_time", OPT_USE_GLOBAL_LONG_QUERY_TIME,
446 + "Control always use global long_query_time or local long_query_time.",
447 + (uchar**) &opt_use_global_long_query_time, (uchar**) &opt_use_global_long_query_time,
448-+ 0, GET_BOOL, REQUIRED_ARG, 0, 0, 1, 0, 1, 0},
449++ 0, GET_BOOL, OPT_ARG, 0, 0, 1, 0, 1, 0},
450 + {"slow_query_log_microseconds_timestamp", OPT_SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP,
451 + "Use microsecond time's precision in slow query log",
452 + (uchar**) &opt_slow_query_log_microseconds_timestamp, (uchar**) &opt_slow_query_log_microseconds_timestamp,
453-+ 0, GET_BOOL, REQUIRED_ARG, 0, 0, 1, 0, 1, 0},
454++ 0, GET_BOOL, OPT_ARG, 0, 0, 1, 0, 1, 0},
455 {"lower_case_table_names", OPT_LOWER_CASE_TABLE_NAMES,
456 "If set to 1, table names are stored in lowercase on disk and table names "
457 "will be case-insensitive. Should be set to 2 if you are using a case-"
458@@ -641,7 +641,17 @@
459 /*
460 Default behavior for 4.1 and 5.0 is to treat NULL values as unequal
461 when collecting index statistics for MyISAM tables.
462-@@ -8458,6 +8504,41 @@
463+@@ -8064,6 +8110,9 @@
464+ return 0;
465+ }
466+
467++/* defined in sql/setvar.cc */
468++extern void use_global_long_query_time_update(bool enable);
469++
470+
471+ my_bool
472+ mysqld_get_one_option(int optid,
473+@@ -8458,6 +8504,44 @@
474 case OPT_BOOTSTRAP:
475 opt_noacl=opt_bootstrap=1;
476 break;
477@@ -663,21 +673,24 @@
478 + exit(1);
479 + }
480 + break;
481++ case OPT_USE_GLOBAL_LONG_QUERY_TIME:
482++ use_global_long_query_time_update(opt_use_global_long_query_time == TRUE);
483++ break;
484 + case OPT_USE_GLOBAL_LOG_SLOW_CONTROL:
485 + {
486 + ulong &v = global_system_variables.use_global_log_slow_control;
487 + v = msl_flag_resolve_by_name(slog_use_global, argument, SLOG_UG_NONE, SLOG_UG_INVALID);
488 + if (v != SLOG_UG_NONE)
489 + {
490-+ ulong mask = SLOG_UG_NONE;
491-+ mask = ~mask;
492-+ v = v & mask;
493++ v = v & (~(SLOG_UG_NONE));
494 + }
495 + if (v == SLOG_UG_INVALID)
496 + {
497 + fprintf(stderr,"Invalid argument in use_global_log_slow_control: %s\n", argument);
498 + exit(1);
499 + }
500++ use_global_long_query_time_update(
501++ global_system_variables.use_global_log_slow_control & SLOG_UG_LONG_QUERY_TIME);
502 + break;
503 + }
504 case OPT_SERVER_ID:
505@@ -686,7 +699,7 @@
506 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
507 --- a/sql/set_var.cc 2010-08-04 02:24:33.000000000 +0900
508 +++ b/sql/set_var.cc 2010-08-27 14:30:34.873021323 +0900
509-@@ -160,6 +160,73 @@
510+@@ -160,6 +160,74 @@
511
512 static sys_var_chain vars = { NULL, NULL };
513
514@@ -698,6 +711,7 @@
515 + log_slow_control = log_slow_control | SLOG_UG_LONG_QUERY_TIME;
516 + else
517 + log_slow_control = log_slow_control & (~(SLOG_UG_LONG_QUERY_TIME));
518++ log_slow_control = log_slow_control & (~(SLOG_UG_NONE));
519 + if(0 == log_slow_control)
520 + log_slow_control = SLOG_UG_NONE;
521 +}
522
523=== modified file 'suppress_log_warning_1592.patch'
524--- suppress_log_warning_1592.patch 2010-11-25 10:17:50 +0000
525+++ suppress_log_warning_1592.patch 2010-12-17 19:11:56 +0000
526@@ -49,7 +49,7 @@
527 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
528 --- a/sql/set_var.cc 2010-07-26 18:31:59.093062279 +0900
529 +++ b/sql/set_var.cc 2010-07-26 18:34:10.210061358 +0900
530-@@ -562,6 +562,8 @@
531+@@ -563,6 +563,8 @@
532 &opt_thread_statistics);
533 static sys_var_bool_ptr sys_optimizer_fix(&vars, "optimizer_fix",
534 &opt_optimizer_fix);
535
536=== modified file 'userstat.patch'
537--- userstat.patch 2010-11-26 08:21:55 +0000
538+++ userstat.patch 2010-12-17 19:11:56 +0000
539@@ -752,7 +752,7 @@
540 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
541 --- a/sql/set_var.cc 2010-11-24 17:24:51.000000000 +0300
542 +++ b/sql/set_var.cc 2010-11-24 17:31:34.000000000 +0300
543-@@ -556,6 +556,10 @@
544+@@ -557,6 +557,10 @@
545 static sys_var_thd_ulong sys_read_buff_size(&vars, "read_buffer_size",
546 &SV::read_buff_size);
547 static sys_var_opt_readonly sys_readonly(&vars, "read_only", &opt_readonly);

Subscribers

People subscribed via source and target branches

to all changes: