Percona Server moved to https://jira.percona.com/projects/PS

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

  1. release-5.1.53-12-slow_extended-fix
  2. Merge into release-5.1.53
Proposed by Oleg Tsarev
Status: Rejected
Rejected by: Alexey Kopytov
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) Disapprove
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.
Revision history for this message
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

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

177. By Oleg Tsarev

fix new line carrets

176. By Oleg Tsarev

fix new line carrets

175. By Oleg Tsarev

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

174. By kinoyasu <kinoyasu@gauntlet4>

backport adaptive_checkpoint=keep_average and innodb_log_block_size from XtraDB on 5.5.7 dev-branch

173. By Aleksandr Kuzminsky

fixed compile error of query_response_time.cc from response_time_distribution.patch (bad offsets in patch)

172. By kinoyasu <kinoyasu@gauntlet4>

fix bug690144

171. By Oleg Tsarev

add option --without-response_time_distribution to response-time-distribution.patch
Also added variable have_response_time_distribution

170. By Oleg Tsarev

fix bug 689830

169. By kinoyasu <kinoyasu@gauntlet4>

lp:~percona-dev/percona-server/release-5.1.51-12-expand_import_fix4autoinc is merged... (apply fix for innodb_expand_import.patch from Vamsi@FaceBook about autoinc)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'control_online_alter_index.patch'
--- control_online_alter_index.patch 2010-11-16 13:48:48 +0000
+++ control_online_alter_index.patch 2010-12-17 19:11:56 +0000
@@ -56,7 +56,7 @@
56diff -ruN a/sql/set_var.cc b/sql/set_var.cc56diff -ruN a/sql/set_var.cc b/sql/set_var.cc
57--- a/sql/set_var.cc 2010-07-21 22:49:54.019529438 +090057--- a/sql/set_var.cc 2010-07-21 22:49:54.019529438 +0900
58+++ b/sql/set_var.cc 2010-07-21 22:50:24.122532110 +090058+++ b/sql/set_var.cc 2010-07-21 22:50:24.122532110 +0900
59@@ -747,6 +747,11 @@59@@ -748,6 +748,11 @@
60 sys_engine_condition_pushdown(&vars, "engine_condition_pushdown",60 sys_engine_condition_pushdown(&vars, "engine_condition_pushdown",
61 &SV::engine_condition_pushdown);61 &SV::engine_condition_pushdown);
62 62
6363
=== modified file 'microsec_process.patch'
--- microsec_process.patch 2010-08-27 10:03:57 +0000
+++ microsec_process.patch 2010-12-17 19:11:56 +0000
@@ -5,7 +5,7 @@
5#!!! notice !!!5#!!! notice !!!
6# Any small change to this file in the main branch6# Any small change to this file in the main branch
7# should be done or reviewed by the maintainer!7# should be done or reviewed by the maintainer!
8diff -ruN a/patch_info/microsec_process.info b/patch_info/microsec_process.info8diff -ruN /dev/null b/patch_info/microsec_process.info
9--- /dev/null 1970-01-01 09:00:00.000000000 +09009--- /dev/null 1970-01-01 09:00:00.000000000 +0900
10+++ b/patch_info/microsec_process.info 2010-08-27 14:45:52.941058849 +090010+++ b/patch_info/microsec_process.info 2010-08-27 14:45:52.941058849 +0900
11@@ -0,0 +1,8 @@11@@ -0,0 +1,8 @@
1212
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-combined-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-combined-master.opt 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-combined-master.opt 2010-12-17 19:11:56 +0000
@@ -0,0 +1,1 @@
1--use_global_long_query_time --log_slow_verbosity="full"
02
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-combined.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-combined.result 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-combined.result 2010-12-17 19:11:56 +0000
@@ -0,0 +1,18 @@
1show variables like 'use_global_long_query_time';
2Variable_name Value
3use_global_long_query_time ON
4show variables like 'use_global_log_slow_control';
5Variable_name Value
6use_global_log_slow_control long_query_time
7show variables like 'log_slow_verbosity';
8Variable_name Value
9log_slow_verbosity microtime,query_plan,innodb
10show global variables like 'use_global_long_query_time';
11Variable_name Value
12use_global_long_query_time ON
13show global variables like 'log_slow_verbosity';
14Variable_name Value
15log_slow_verbosity microtime,query_plan,innodb
16show global variables like 'use_global_log_slow_control';
17Variable_name Value
18use_global_log_slow_control long_query_time
019
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-combined.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-combined.test 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-combined.test 2010-12-17 19:11:56 +0000
@@ -0,0 +1,6 @@
1show variables like 'use_global_long_query_time';
2show variables like 'use_global_log_slow_control';
3show variables like 'log_slow_verbosity';
4show global variables like 'use_global_long_query_time';
5show global variables like 'log_slow_verbosity';
6show global variables like 'use_global_log_slow_control';
07
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-combined2-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-combined2-master.opt 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-combined2-master.opt 2010-12-17 19:11:56 +0000
@@ -0,0 +1,1 @@
1--use_global_log_slow_control="long_query_time"
02
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-combined2.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-combined2.result 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-combined2.result 2010-12-17 19:11:56 +0000
@@ -0,0 +1,12 @@
1show variables like 'use_global_long_query_time';
2Variable_name Value
3use_global_long_query_time ON
4show variables like 'use_global_log_slow_control';
5Variable_name Value
6use_global_log_slow_control long_query_time
7show global variables like 'use_global_long_query_time';
8Variable_name Value
9use_global_long_query_time ON
10show global variables like 'use_global_log_slow_control';
11Variable_name Value
12use_global_log_slow_control long_query_time
013
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-combined2.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-combined2.test 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-combined2.test 2010-12-17 19:11:56 +0000
@@ -0,0 +1,4 @@
1show variables like 'use_global_long_query_time';
2show variables like 'use_global_log_slow_control';
3show global variables like 'use_global_long_query_time';
4show global variables like 'use_global_log_slow_control';
05
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl-master.opt 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl-master.opt 2010-12-17 19:11:56 +0000
@@ -0,0 +1,1 @@
1--log_slow_sp_statements
02
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.result 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.result 2010-12-17 19:11:56 +0000
@@ -0,0 +1,3 @@
1show global variables like 'log_slow_sp_statements';
2Variable_name Value
3log_slow_sp_statements ON
04
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.test 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.test 2010-12-17 19:11:56 +0000
@@ -0,0 +1,1 @@
1show global variables like 'log_slow_sp_statements';
02
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl-master.opt 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl-master.opt 2010-12-17 19:11:56 +0000
@@ -0,0 +1,1 @@
1--log_slow_timestamp_every
02
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.result 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.result 2010-12-17 19:11:56 +0000
@@ -0,0 +1,3 @@
1show global variables like 'log_slow_timestamp_every';
2Variable_name Value
3log_slow_timestamp_every ON
04
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.test 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.test 2010-12-17 19:11:56 +0000
@@ -0,0 +1,1 @@
1show global variables like 'log_slow_timestamp_every';
02
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl-master.opt 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl-master.opt 2010-12-17 19:11:56 +0000
@@ -0,0 +1,1 @@
1--log_slow_verbosity="full"
02
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.result 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.result 2010-12-17 19:11:56 +0000
@@ -0,0 +1,9 @@
1show global variables like 'log_slow_verbosity';
2Variable_name Value
3log_slow_verbosity microtime,query_plan,innodb
4show variables like 'log_slow_verbosity';
5Variable_name Value
6log_slow_verbosity microtime,query_plan,innodb
7select @@log_slow_verbosity;
8@@log_slow_verbosity
9microtime,query_plan,innodb
010
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.test 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.test 2010-12-17 19:11:56 +0000
@@ -0,0 +1,3 @@
1show global variables like 'log_slow_verbosity';
2show variables like 'log_slow_verbosity';
3select @@log_slow_verbosity;
04
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test 2010-11-18 11:47:03 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test 2010-12-17 19:11:56 +0000
@@ -78,7 +78,7 @@
78-- echo # Analyse master slow_query_log78-- echo # Analyse master slow_query_log
79let $i=5;79let $i=5;
80let $k=1;80let $k=1;
81let $cmd=cat ./var/mysqld.1/data/percona_log_slow_slave_statements-master.log | grep;81let $cmd=cat $MYSQLTEST_VARDIR/mysqld.1/data/percona_log_slow_slave_statements-master.log | grep;
82while($i)82while($i)
83{83{
84 let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;84 let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
@@ -90,7 +90,7 @@
90-- echo # Analyse slave slow_query_log90-- echo # Analyse slave slow_query_log
91let $i=5;91let $i=5;
92let $k=1;92let $k=1;
93let $cmd=cat ./var/mysqld.2/data/percona_log_slow_slave_statements-slave.log | grep;93let $cmd=cat $MYSQLTEST_VARDIR/mysqld.2/data/percona_log_slow_slave_statements-slave.log | grep;
94while($i)94while($i)
95{95{
96 let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;96 let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
9797
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test 2010-11-18 12:19:15 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test 2010-12-17 19:11:56 +0000
@@ -125,7 +125,7 @@
125-- echo # Analyse master slow_query_log125-- echo # Analyse master slow_query_log
126let $i=7;126let $i=7;
127let $k=1;127let $k=1;
128let $cmd=cat ./var/mysqld.1/data/percona_log_slow_slave_statements-master.log | grep;128let $cmd=cat $MYSQLTEST_VARDIR/mysqld.1/data/percona_log_slow_slave_statements-master.log | grep;
129while($i)129while($i)
130{130{
131 let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;131 let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
@@ -137,7 +137,7 @@
137-- echo # Analyse slave slow_query_log137-- echo # Analyse slave slow_query_log
138let $i=7;138let $i=7;
139let $k=1;139let $k=1;
140let $cmd=cat ./var/mysqld.2/data/percona_log_slow_slave_statements-slave.log | grep;140let $cmd=cat $MYSQLTEST_VARDIR/mysqld.2/data/percona_log_slow_slave_statements-slave.log | grep;
141while($i)141while($i)
142{142{
143 let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;143 let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
144144
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl-master.opt 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl-master.opt 2010-12-17 19:11:56 +0000
@@ -0,0 +1,1 @@
1--slow_query_log_microseconds_timestamp
02
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.result 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.result 2010-12-17 19:11:56 +0000
@@ -0,0 +1,3 @@
1show global variables like 'slow_query_log_microseconds_timestamp';
2Variable_name Value
3slow_query_log_microseconds_timestamp ON
04
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.test 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.test 2010-12-17 19:11:56 +0000
@@ -0,0 +1,1 @@
1show global variables like 'slow_query_log_microseconds_timestamp';
02
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl-master.opt 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl-master.opt 2010-12-17 19:11:56 +0000
@@ -0,0 +1,1 @@
1--use_global_long_query_time
02
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.result 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.result 2010-12-17 19:11:56 +0000
@@ -0,0 +1,3 @@
1show global variables like 'use_global_long_query_time';
2Variable_name Value
3use_global_long_query_time ON
04
=== added file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.test 1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.test 2010-12-17 19:11:56 +0000
@@ -0,0 +1,1 @@
1show global variables like 'use_global_long_query_time';
02
=== modified file 'optimizer_fix.patch'
--- optimizer_fix.patch 2010-11-25 10:17:50 +0000
+++ optimizer_fix.patch 2010-12-17 19:11:56 +0000
@@ -148,7 +148,7 @@
148diff -ruN a/sql/set_var.cc b/sql/set_var.cc148diff -ruN a/sql/set_var.cc b/sql/set_var.cc
149--- a/sql/set_var.cc 2010-07-26 18:29:12.250113584 +0900149--- a/sql/set_var.cc 2010-07-26 18:29:12.250113584 +0900
150+++ b/sql/set_var.cc 2010-07-26 18:29:35.724113196 +0900150+++ b/sql/set_var.cc 2010-07-26 18:29:35.724113196 +0900
151@@ -560,6 +560,8 @@151@@ -561,6 +561,8 @@
152 &opt_userstat_running);152 &opt_userstat_running);
153 static sys_var_bool_ptr sys_thread_statistics(&vars, "thread_statistics",153 static sys_var_bool_ptr sys_thread_statistics(&vars, "thread_statistics",
154 &opt_thread_statistics);154 &opt_thread_statistics);
155155
=== modified file 'profiling_slow.patch'
--- profiling_slow.patch 2010-12-13 17:52:47 +0000
+++ profiling_slow.patch 2010-12-17 19:11:56 +0000
@@ -5,6 +5,7 @@
5#!!! notice !!!5#!!! notice !!!
6# Any small change to this file in the main branch6# Any small change to this file in the main branch
7# should be done or reviewed by the maintainer!7# should be done or reviewed by the maintainer!
8diff -ruN /dev/null b/mysql-test/r/percona_bug643149.result
8--- /dev/null 1970-01-01 00:00:00.000000000 +00009--- /dev/null 1970-01-01 00:00:00.000000000 +0000
9+++ b/mysql-test/r/percona_bug643149.result 2010-11-25 23:52:28.000000000 +030010+++ b/mysql-test/r/percona_bug643149.result 2010-11-25 23:52:28.000000000 +0300
10@@ -0,0 +1,16 @@11@@ -0,0 +1,16 @@
@@ -24,9 +25,10 @@
24+# 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 25+# 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
25+# Profile_total: X.X Profile_total_cpu: X.X 26+# Profile_total: X.X Profile_total_cpu: X.X
26+SET GLOBAL slow_query_log_file=@old_slow_query_log_file;27+SET GLOBAL slow_query_log_file=@old_slow_query_log_file;
28diff -ruN /dev/null b/mysql-test/t/percona_bug643149.test
27--- /dev/null 1970-01-01 00:00:00.000000000 +000029--- /dev/null 1970-01-01 00:00:00.000000000 +0000
28+++ b/mysql-test/t/percona_bug643149.test 2010-11-25 23:52:08.000000000 +030030+++ b/mysql-test/t/percona_bug643149.test 2010-11-25 23:52:08.000000000 +0300
29@@ -0,0 +1,47 @@31@@ -0,0 +1,50 @@
30+#32+#
31+# This test suffers from server33+# This test suffers from server
32+# Bug#38124 "general_log_file" variable silently unset when using expression34+# Bug#38124 "general_log_file" variable silently unset when using expression
@@ -77,6 +79,7 @@
77+ eval SET @@global.slow_query_log_file = '$my_var';79+ eval SET @@global.slow_query_log_file = '$my_var';
78+ --enable_query_log80+ --enable_query_log
79+}81+}
82diff -ruN /dev/null b/patch_info/profiling_slow.info
80--- /dev/null 1970-01-01 00:00:00.000000000 +000083--- /dev/null 1970-01-01 00:00:00.000000000 +0000
81+++ b/patch_info/profiling_slow.info 2010-11-24 19:33:02.000000000 +030084+++ b/patch_info/profiling_slow.info 2010-11-24 19:33:02.000000000 +0300
82@@ -0,0 +1,9 @@85@@ -0,0 +1,9 @@
@@ -89,6 +92,7 @@
89+Changelog92+Changelog
90+2009-05-1893+2009-05-18
91+Initial implementation94+Initial implementation
95diff -ruN a/sql/log.cc b/sql/log.cc
92--- a/sql/log.cc 2010-11-24 19:33:02.000000000 +030096--- a/sql/log.cc 2010-11-24 19:33:02.000000000 +0300
93+++ b/sql/log.cc 2010-11-24 19:36:29.000000000 +030097+++ b/sql/log.cc 2010-11-24 19:36:29.000000000 +0300
94@@ -2433,6 +2433,11 @@98@@ -2433,6 +2433,11 @@
@@ -103,6 +107,7 @@
103 if (thd->db && strcmp(thd->db, db))107 if (thd->db && strcmp(thd->db, db))
104 { // Database changed108 { // Database changed
105 if (my_b_printf(&log_file,"use %s;\n",thd->db) == (uint) -1)109 if (my_b_printf(&log_file,"use %s;\n",thd->db) == (uint) -1)
110diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
106--- a/sql/mysqld.cc 2010-11-24 19:33:02.000000000 +0300111--- a/sql/mysqld.cc 2010-11-24 19:33:02.000000000 +0300
107+++ b/sql/mysqld.cc 2010-11-24 19:36:29.000000000 +0300112+++ b/sql/mysqld.cc 2010-11-24 19:36:29.000000000 +0300
108@@ -5778,6 +5778,8 @@113@@ -5778,6 +5778,8 @@
@@ -131,9 +136,10 @@
131 #endif136 #endif
132 {"relay-log", OPT_RELAY_LOG,137 {"relay-log", OPT_RELAY_LOG,
133 "The location and name to use for relay logs.",138 "The location and name to use for relay logs.",
139diff -ruN a/sql/set_var.cc b/sql/set_var.cc
134--- a/sql/set_var.cc 2010-11-24 19:33:02.000000000 +0300140--- a/sql/set_var.cc 2010-11-24 19:33:02.000000000 +0300
135+++ b/sql/set_var.cc 2010-11-24 19:36:29.000000000 +0300141+++ b/sql/set_var.cc 2010-11-24 19:36:29.000000000 +0300
136@@ -847,6 +847,10 @@142@@ -848,6 +848,10 @@
137 ulonglong(OPTION_PROFILING));143 ulonglong(OPTION_PROFILING));
138 static sys_var_thd_ulong sys_profiling_history_size(&vars, "profiling_history_size",144 static sys_var_thd_ulong sys_profiling_history_size(&vars, "profiling_history_size",
139 &SV::profiling_history_size);145 &SV::profiling_history_size);
@@ -144,6 +150,7 @@
144 #endif150 #endif
145 151
146 /* Local state variables */152 /* Local state variables */
153diff -ruN a/sql/sql_class.h b/sql/sql_class.h
147--- a/sql/sql_class.h 2010-11-24 19:33:02.000000000 +0300154--- a/sql/sql_class.h 2010-11-24 19:33:02.000000000 +0300
148+++ b/sql/sql_class.h 2010-11-24 19:36:29.000000000 +0300155+++ b/sql/sql_class.h 2010-11-24 19:36:29.000000000 +0300
149@@ -328,6 +328,8 @@156@@ -328,6 +328,8 @@
@@ -155,6 +162,7 @@
155 ulong query_cache_type;162 ulong query_cache_type;
156 ulong read_buff_size;163 ulong read_buff_size;
157 ulong read_rnd_buff_size;164 ulong read_rnd_buff_size;
165diff -ruN a/sql/sql_profile.cc b/sql/sql_profile.cc
158--- a/sql/sql_profile.cc 2010-10-12 00:34:33.000000000 +0400166--- a/sql/sql_profile.cc 2010-10-12 00:34:33.000000000 +0400
159+++ b/sql/sql_profile.cc 2010-11-25 16:09:12.000000000 +0300167+++ b/sql/sql_profile.cc 2010-11-25 16:09:12.000000000 +0300
160@@ -223,8 +223,22 @@168@@ -223,8 +223,22 @@
@@ -319,6 +327,7 @@
319 /**327 /**
320 Fill the information schema table, "query_profile", as defined in show.cc .328 Fill the information schema table, "query_profile", as defined in show.cc .
321 There are two ways to get to this function: Selecting from the information329 There are two ways to get to this function: Selecting from the information
330diff -ruN a/sql/sql_profile.h b/sql/sql_profile.h
322--- a/sql/sql_profile.h 2010-10-12 00:34:33.000000000 +0400331--- a/sql/sql_profile.h 2010-10-12 00:34:33.000000000 +0400
323+++ b/sql/sql_profile.h 2010-11-25 15:54:48.000000000 +0300332+++ b/sql/sql_profile.h 2010-11-25 15:54:48.000000000 +0300
324@@ -165,11 +165,15 @@333@@ -165,11 +165,15 @@
325334
=== modified file 'query_cache_enhance.patch'
--- query_cache_enhance.patch 2010-11-26 11:54:21 +0000
+++ query_cache_enhance.patch 2010-12-17 19:11:56 +0000
@@ -119,7 +119,7 @@
119 static void fix_myisam_max_sort_file_size(THD *thd, enum_var_type type);119 static void fix_myisam_max_sort_file_size(THD *thd, enum_var_type type);
120 static void fix_max_binlog_size(THD *thd, enum_var_type type);120 static void fix_max_binlog_size(THD *thd, enum_var_type type);
121 static void fix_max_relay_log_size(THD *thd, enum_var_type type);121 static void fix_max_relay_log_size(THD *thd, enum_var_type type);
122@@ -570,9 +572,6 @@122@@ -571,9 +573,6 @@
123 &SV::div_precincrement);123 &SV::div_precincrement);
124 static sys_var_long_ptr sys_rpl_recovery_rank(&vars, "rpl_recovery_rank",124 static sys_var_long_ptr sys_rpl_recovery_rank(&vars, "rpl_recovery_rank",
125 &rpl_recovery_rank);125 &rpl_recovery_rank);
@@ -129,7 +129,7 @@
129 129
130 static sys_var_thd_ulong sys_range_alloc_block_size(&vars, "range_alloc_block_size",130 static sys_var_thd_ulong sys_range_alloc_block_size(&vars, "range_alloc_block_size",
131 &SV::range_alloc_block_size);131 &SV::range_alloc_block_size);
132@@ -638,14 +637,20 @@132@@ -639,14 +638,20 @@
133 NULL);133 NULL);
134 134
135 #ifdef HAVE_QUERY_CACHE135 #ifdef HAVE_QUERY_CACHE
@@ -155,7 +155,7 @@
155 static sys_var_thd_bool155 static sys_var_thd_bool
156 sys_query_cache_wlock_invalidate(&vars, "query_cache_wlock_invalidate",156 sys_query_cache_wlock_invalidate(&vars, "query_cache_wlock_invalidate",
157 &SV::query_cache_wlock_invalidate);157 &SV::query_cache_wlock_invalidate);
158@@ -929,6 +934,8 @@158@@ -930,6 +935,8 @@
159 #ifndef EMBEDDED_LIBRARY159 #ifndef EMBEDDED_LIBRARY
160 static sys_var_const_str_ptr sys_repl_report_host(&vars, "report_host", &report_host);160 static sys_var_const_str_ptr sys_repl_report_host(&vars, "report_host", &report_host);
161 static sys_var_const_str_ptr sys_repl_report_user(&vars, "report_user", &report_user);161 static sys_var_const_str_ptr sys_repl_report_user(&vars, "report_user", &report_user);
@@ -164,7 +164,7 @@
164 static sys_var_const_str_ptr sys_repl_report_password(&vars, "report_password", &report_password);164 static sys_var_const_str_ptr sys_repl_report_password(&vars, "report_password", &report_password);
165 165
166 static uchar *slave_get_report_port(THD *thd)166 static uchar *slave_get_report_port(THD *thd)
167@@ -1239,10 +1246,9 @@167@@ -1240,10 +1247,9 @@
168 {}168 {}
169 #endif /* HAVE_REPLICATION */169 #endif /* HAVE_REPLICATION */
170 170
@@ -176,7 +176,7 @@
176 ulong new_cache_size= query_cache.resize(query_cache_size);176 ulong new_cache_size= query_cache.resize(query_cache_size);
177 177
178 /*178 /*
179@@ -1256,11 +1262,35 @@179@@ -1257,11 +1263,35 @@
180 query_cache_size, new_cache_size);180 query_cache_size, new_cache_size);
181 181
182 query_cache_size= new_cache_size;182 query_cache_size= new_cache_size;
@@ -214,7 +214,7 @@
214 static void fix_query_cache_min_res_unit(THD *thd, enum_var_type type)214 static void fix_query_cache_min_res_unit(THD *thd, enum_var_type type)
215 {215 {
216 query_cache_min_res_unit= 216 query_cache_min_res_unit=
217@@ -3634,6 +3664,16 @@217@@ -3635,6 +3665,16 @@
218 Functions to handle SET mysql_internal_variable=const_expr218 Functions to handle SET mysql_internal_variable=const_expr
219 *****************************************************************************/219 *****************************************************************************/
220 220
221221
=== modified file 'response-time-distribution.patch'
--- response-time-distribution.patch 2010-12-15 13:13:13 +0000
+++ response-time-distribution.patch 2010-12-17 19:11:56 +0000
@@ -186,7 +186,7 @@
186@@ -6969,6 +6985,23 @@186@@ -6969,6 +6985,23 @@
187 "Use microsecond time's precision in slow query log",187 "Use microsecond time's precision in slow query log",
188 (uchar**) &opt_slow_query_log_microseconds_timestamp, (uchar**) &opt_slow_query_log_microseconds_timestamp,188 (uchar**) &opt_slow_query_log_microseconds_timestamp, (uchar**) &opt_slow_query_log_microseconds_timestamp,
189 0, GET_BOOL, REQUIRED_ARG, 0, 0, 1, 0, 1, 0},189 0, GET_BOOL, OPT_ARG, 0, 0, 1, 0, 1, 0},
190+#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION190+#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
191+ {"query_response_time_range_base", OPT_QRT_RANGE_BASE,191+ {"query_response_time_range_base", OPT_QRT_RANGE_BASE,
192+ "Select base of log for query_response_time ranges. WARNING: variable change affect only after flush",192+ "Select base of log for query_response_time ranges. WARNING: variable change affect only after flush",
@@ -670,7 +670,7 @@
670diff -ruN a/sql/set_var.cc b/sql/set_var.cc670diff -ruN a/sql/set_var.cc b/sql/set_var.cc
671--- a/sql/set_var.cc 2010-11-01 08:43:57.000000000 +0000671--- a/sql/set_var.cc 2010-11-01 08:43:57.000000000 +0000
672+++ b/sql/set_var.cc 2010-11-01 08:52:40.000000000 +0000672+++ b/sql/set_var.cc 2010-11-01 08:52:40.000000000 +0000
673@@ -1006,6 +1006,14 @@673@@ -1007,6 +1007,14 @@
674 static sys_var_use_global_long_query_time sys_use_global_long_query_time;674 static sys_var_use_global_long_query_time sys_use_global_long_query_time;
675 static sys_var_bool_ptr sys_slow_query_log_microseconds_timestamp(&vars, "slow_query_log_microseconds_timestamp",675 static sys_var_bool_ptr sys_slow_query_log_microseconds_timestamp(&vars, "slow_query_log_microseconds_timestamp",
676 &opt_slow_query_log_microseconds_timestamp);676 &opt_slow_query_log_microseconds_timestamp);
677677
=== modified file 'slow_extended.patch'
--- slow_extended.patch 2010-11-26 11:54:21 +0000
+++ slow_extended.patch 2010-12-17 19:11:56 +0000
@@ -611,22 +611,22 @@
611+ {"log_slow_sp_statements", OPT_LOG_SLOW_SP_STATEMENTS,611+ {"log_slow_sp_statements", OPT_LOG_SLOW_SP_STATEMENTS,
612+ "Log slow statements executed by stored procedure to the slow log if it is open.",612+ "Log slow statements executed by stored procedure to the slow log if it is open.",
613+ (uchar**) &opt_log_slow_sp_statements, (uchar**) &opt_log_slow_sp_statements,613+ (uchar**) &opt_log_slow_sp_statements, (uchar**) &opt_log_slow_sp_statements,
614+ 0, GET_BOOL, REQUIRED_ARG, 1, 0, 1, 0, 1, 0},614+ 0, GET_BOOL, OPT_ARG, 1, 0, 1, 0, 1, 0},
615+ {"log_slow_timestamp_every", OPT_LOG_SLOW_TIMESTAMP_EVERY,615+ {"log_slow_timestamp_every", OPT_LOG_SLOW_TIMESTAMP_EVERY,
616+ "Timestamp is printed for all records of the slow log even if they are same time.",616+ "Timestamp is printed for all records of the slow log even if they are same time.",
617+ (uchar**) &opt_log_slow_timestamp_every, (uchar**) &opt_log_slow_timestamp_every,617+ (uchar**) &opt_log_slow_timestamp_every, (uchar**) &opt_log_slow_timestamp_every,
618+ 0, GET_BOOL, REQUIRED_ARG, 0, 0, 1, 0, 1, 0},618+ 0, GET_BOOL, OPT_ARG, 0, 0, 1, 0, 1, 0},
619+ {"use_global_log_slow_control", OPT_USE_GLOBAL_LOG_SLOW_CONTROL,619+ {"use_global_log_slow_control", OPT_USE_GLOBAL_LOG_SLOW_CONTROL,
620+ "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]",620+ "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]",
621+ 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, SLOG_UG_NONE, 0, 0},621+ 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, SLOG_UG_NONE, 0, 0},
622+ {"use_global_long_query_time", OPT_USE_GLOBAL_LONG_QUERY_TIME,622+ {"use_global_long_query_time", OPT_USE_GLOBAL_LONG_QUERY_TIME,
623+ "Control always use global long_query_time or local long_query_time.",623+ "Control always use global long_query_time or local long_query_time.",
624+ (uchar**) &opt_use_global_long_query_time, (uchar**) &opt_use_global_long_query_time,624+ (uchar**) &opt_use_global_long_query_time, (uchar**) &opt_use_global_long_query_time,
625+ 0, GET_BOOL, REQUIRED_ARG, 0, 0, 1, 0, 1, 0},625+ 0, GET_BOOL, OPT_ARG, 0, 0, 1, 0, 1, 0},
626+ {"slow_query_log_microseconds_timestamp", OPT_SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP,626+ {"slow_query_log_microseconds_timestamp", OPT_SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP,
627+ "Use microsecond time's precision in slow query log",627+ "Use microsecond time's precision in slow query log",
628+ (uchar**) &opt_slow_query_log_microseconds_timestamp, (uchar**) &opt_slow_query_log_microseconds_timestamp,628+ (uchar**) &opt_slow_query_log_microseconds_timestamp, (uchar**) &opt_slow_query_log_microseconds_timestamp,
629+ 0, GET_BOOL, REQUIRED_ARG, 0, 0, 1, 0, 1, 0},629+ 0, GET_BOOL, OPT_ARG, 0, 0, 1, 0, 1, 0},
630 {"lower_case_table_names", OPT_LOWER_CASE_TABLE_NAMES,630 {"lower_case_table_names", OPT_LOWER_CASE_TABLE_NAMES,
631 "If set to 1, table names are stored in lowercase on disk and table names "631 "If set to 1, table names are stored in lowercase on disk and table names "
632 "will be case-insensitive. Should be set to 2 if you are using a case-"632 "will be case-insensitive. Should be set to 2 if you are using a case-"
@@ -641,7 +641,17 @@
641 /*641 /*
642 Default behavior for 4.1 and 5.0 is to treat NULL values as unequal642 Default behavior for 4.1 and 5.0 is to treat NULL values as unequal
643 when collecting index statistics for MyISAM tables.643 when collecting index statistics for MyISAM tables.
644@@ -8458,6 +8504,41 @@644@@ -8064,6 +8110,9 @@
645 return 0;
646 }
647
648+/* defined in sql/setvar.cc */
649+extern void use_global_long_query_time_update(bool enable);
650+
651
652 my_bool
653 mysqld_get_one_option(int optid,
654@@ -8458,6 +8504,44 @@
645 case OPT_BOOTSTRAP:655 case OPT_BOOTSTRAP:
646 opt_noacl=opt_bootstrap=1;656 opt_noacl=opt_bootstrap=1;
647 break;657 break;
@@ -663,21 +673,24 @@
663+ exit(1);673+ exit(1);
664+ }674+ }
665+ break;675+ break;
676+ case OPT_USE_GLOBAL_LONG_QUERY_TIME:
677+ use_global_long_query_time_update(opt_use_global_long_query_time == TRUE);
678+ break;
666+ case OPT_USE_GLOBAL_LOG_SLOW_CONTROL:679+ case OPT_USE_GLOBAL_LOG_SLOW_CONTROL:
667+ {680+ {
668+ ulong &v = global_system_variables.use_global_log_slow_control;681+ ulong &v = global_system_variables.use_global_log_slow_control;
669+ v = msl_flag_resolve_by_name(slog_use_global, argument, SLOG_UG_NONE, SLOG_UG_INVALID);682+ v = msl_flag_resolve_by_name(slog_use_global, argument, SLOG_UG_NONE, SLOG_UG_INVALID);
670+ if (v != SLOG_UG_NONE)683+ if (v != SLOG_UG_NONE)
671+ {684+ {
672+ ulong mask = SLOG_UG_NONE;685+ v = v & (~(SLOG_UG_NONE));
673+ mask = ~mask;
674+ v = v & mask;
675+ }686+ }
676+ if (v == SLOG_UG_INVALID)687+ if (v == SLOG_UG_INVALID)
677+ {688+ {
678+ fprintf(stderr,"Invalid argument in use_global_log_slow_control: %s\n", argument);689+ fprintf(stderr,"Invalid argument in use_global_log_slow_control: %s\n", argument);
679+ exit(1);690+ exit(1);
680+ }691+ }
692+ use_global_long_query_time_update(
693+ global_system_variables.use_global_log_slow_control & SLOG_UG_LONG_QUERY_TIME);
681+ break;694+ break;
682+ }695+ }
683 case OPT_SERVER_ID:696 case OPT_SERVER_ID:
@@ -686,7 +699,7 @@
686diff -ruN a/sql/set_var.cc b/sql/set_var.cc699diff -ruN a/sql/set_var.cc b/sql/set_var.cc
687--- a/sql/set_var.cc 2010-08-04 02:24:33.000000000 +0900700--- a/sql/set_var.cc 2010-08-04 02:24:33.000000000 +0900
688+++ b/sql/set_var.cc 2010-08-27 14:30:34.873021323 +0900701+++ b/sql/set_var.cc 2010-08-27 14:30:34.873021323 +0900
689@@ -160,6 +160,73 @@702@@ -160,6 +160,74 @@
690 703
691 static sys_var_chain vars = { NULL, NULL };704 static sys_var_chain vars = { NULL, NULL };
692 705
@@ -698,6 +711,7 @@
698+ log_slow_control = log_slow_control | SLOG_UG_LONG_QUERY_TIME;711+ log_slow_control = log_slow_control | SLOG_UG_LONG_QUERY_TIME;
699+ else712+ else
700+ log_slow_control = log_slow_control & (~(SLOG_UG_LONG_QUERY_TIME));713+ log_slow_control = log_slow_control & (~(SLOG_UG_LONG_QUERY_TIME));
714+ log_slow_control = log_slow_control & (~(SLOG_UG_NONE));
701+ if(0 == log_slow_control)715+ if(0 == log_slow_control)
702+ log_slow_control = SLOG_UG_NONE;716+ log_slow_control = SLOG_UG_NONE;
703+}717+}
704718
=== modified file 'suppress_log_warning_1592.patch'
--- suppress_log_warning_1592.patch 2010-11-25 10:17:50 +0000
+++ suppress_log_warning_1592.patch 2010-12-17 19:11:56 +0000
@@ -49,7 +49,7 @@
49diff -ruN a/sql/set_var.cc b/sql/set_var.cc49diff -ruN a/sql/set_var.cc b/sql/set_var.cc
50--- a/sql/set_var.cc 2010-07-26 18:31:59.093062279 +090050--- a/sql/set_var.cc 2010-07-26 18:31:59.093062279 +0900
51+++ b/sql/set_var.cc 2010-07-26 18:34:10.210061358 +090051+++ b/sql/set_var.cc 2010-07-26 18:34:10.210061358 +0900
52@@ -562,6 +562,8 @@52@@ -563,6 +563,8 @@
53 &opt_thread_statistics);53 &opt_thread_statistics);
54 static sys_var_bool_ptr sys_optimizer_fix(&vars, "optimizer_fix",54 static sys_var_bool_ptr sys_optimizer_fix(&vars, "optimizer_fix",
55 &opt_optimizer_fix);55 &opt_optimizer_fix);
5656
=== modified file 'userstat.patch'
--- userstat.patch 2010-11-26 08:21:55 +0000
+++ userstat.patch 2010-12-17 19:11:56 +0000
@@ -752,7 +752,7 @@
752diff -ruN a/sql/set_var.cc b/sql/set_var.cc752diff -ruN a/sql/set_var.cc b/sql/set_var.cc
753--- a/sql/set_var.cc 2010-11-24 17:24:51.000000000 +0300753--- a/sql/set_var.cc 2010-11-24 17:24:51.000000000 +0300
754+++ b/sql/set_var.cc 2010-11-24 17:31:34.000000000 +0300754+++ b/sql/set_var.cc 2010-11-24 17:31:34.000000000 +0300
755@@ -556,6 +556,10 @@755@@ -557,6 +557,10 @@
756 static sys_var_thd_ulong sys_read_buff_size(&vars, "read_buffer_size",756 static sys_var_thd_ulong sys_read_buff_size(&vars, "read_buffer_size",
757 &SV::read_buff_size);757 &SV::read_buff_size);
758 static sys_var_opt_readonly sys_readonly(&vars, "read_only", &opt_readonly);758 static sys_var_opt_readonly sys_readonly(&vars, "read_only", &opt_readonly);

Subscribers

People subscribed via source and target branches

to all changes: