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

[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
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

[Alexey Kopytov (akopytov)]

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

174. By kinoyasu <kinoyasu@gauntlet4> on 2010-12-16

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

173. By Aleksandr Kuzminsky on 2010-12-15

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

172. By kinoyasu <kinoyasu@gauntlet4> on 2010-12-15

fix bug690144

171. By Oleg Tsarev on 2010-12-14

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

170. By Oleg Tsarev on 2010-12-14

fix bug 689830

169. By kinoyasu <kinoyasu@gauntlet4> on 2010-12-14

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)

=== 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 @@
 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
 --- a/sql/set_var.cc	2010-07-21 22:49:54.019529438 +0900
 +++ b/sql/set_var.cc	2010-07-21 22:50:24.122532110 +0900
-@@ -747,6 +747,11 @@
+@@ -748,6 +748,11 @@
  sys_engine_condition_pushdown(&vars, "engine_condition_pushdown",
  			      &SV::engine_condition_pushdown);
  

=== 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 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/patch_info/microsec_process.info b/patch_info/microsec_process.info
+diff -ruN /dev/null b/patch_info/microsec_process.info
 --- /dev/null	1970-01-01 09:00:00.000000000 +0900
 +++ b/patch_info/microsec_process.info	2010-08-27 14:45:52.941058849 +0900
 @@ -0,0 +1,8 @@

=== 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 @@
+--use_global_long_query_time --log_slow_verbosity="full"

=== 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 @@
+show variables like 'use_global_long_query_time';
+Variable_name	Value
+use_global_long_query_time	ON
+show variables like 'use_global_log_slow_control';
+Variable_name	Value
+use_global_log_slow_control	long_query_time
+show variables like 'log_slow_verbosity';
+Variable_name	Value
+log_slow_verbosity	microtime,query_plan,innodb
+show global variables like 'use_global_long_query_time';
+Variable_name	Value
+use_global_long_query_time	ON
+show global variables like 'log_slow_verbosity';
+Variable_name	Value
+log_slow_verbosity	microtime,query_plan,innodb
+show global variables like 'use_global_log_slow_control';
+Variable_name	Value
+use_global_log_slow_control	long_query_time

=== 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 @@
+show variables like 'use_global_long_query_time';
+show variables like 'use_global_log_slow_control';
+show variables like 'log_slow_verbosity';
+show global variables like 'use_global_long_query_time';
+show global variables like 'log_slow_verbosity';
+show global variables like 'use_global_log_slow_control';

=== 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 @@
+--use_global_log_slow_control="long_query_time"

=== 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 @@
+show variables like 'use_global_long_query_time';
+Variable_name	Value
+use_global_long_query_time	ON
+show variables like 'use_global_log_slow_control';
+Variable_name	Value
+use_global_log_slow_control	long_query_time
+show global variables like 'use_global_long_query_time';
+Variable_name	Value
+use_global_long_query_time	ON
+show global variables like 'use_global_log_slow_control';
+Variable_name	Value
+use_global_log_slow_control	long_query_time

=== 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 @@
+show variables like 'use_global_long_query_time';
+show variables like 'use_global_log_slow_control';
+show global variables like 'use_global_long_query_time';
+show global variables like 'use_global_log_slow_control';

=== 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 @@
+--log_slow_sp_statements

=== 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 @@
+show global variables like 'log_slow_sp_statements';
+Variable_name	Value
+log_slow_sp_statements	ON

=== 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 @@
+show global variables like 'log_slow_sp_statements';

=== 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 @@
+--log_slow_timestamp_every

=== 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 @@
+show global variables like 'log_slow_timestamp_every';
+Variable_name	Value
+log_slow_timestamp_every	ON

=== 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 @@
+show global variables like 'log_slow_timestamp_every';

=== 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 @@
+--log_slow_verbosity="full"

=== 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 @@
+show global variables like 'log_slow_verbosity';
+Variable_name	Value
+log_slow_verbosity	microtime,query_plan,innodb
+show variables like 'log_slow_verbosity';
+Variable_name	Value
+log_slow_verbosity	microtime,query_plan,innodb
+select @@log_slow_verbosity;
+@@log_slow_verbosity
+microtime,query_plan,innodb

=== 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 @@
+show global variables like 'log_slow_verbosity';
+show variables like 'log_slow_verbosity';
+select @@log_slow_verbosity;

=== 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 @@
 -- echo # Analyse master slow_query_log
 let $i=5;
 let $k=1;
-let $cmd=cat ./var/mysqld.1/data/percona_log_slow_slave_statements-master.log | grep;
+let $cmd=cat $MYSQLTEST_VARDIR/mysqld.1/data/percona_log_slow_slave_statements-master.log | grep;
 while($i)
 {
     let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
@@ -90,7 +90,7 @@
 -- echo # Analyse slave slow_query_log
 let $i=5;
 let $k=1;
-let $cmd=cat ./var/mysqld.2/data/percona_log_slow_slave_statements-slave.log | grep;
+let $cmd=cat $MYSQLTEST_VARDIR/mysqld.2/data/percona_log_slow_slave_statements-slave.log | grep;
 while($i)
 {
     let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;

=== 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 @@
 -- echo # Analyse master slow_query_log
 let $i=7;
 let $k=1;
-let $cmd=cat ./var/mysqld.1/data/percona_log_slow_slave_statements-master.log | grep;
+let $cmd=cat $MYSQLTEST_VARDIR/mysqld.1/data/percona_log_slow_slave_statements-master.log | grep;
 while($i)
 {
     let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
@@ -137,7 +137,7 @@
 -- echo # Analyse slave slow_query_log
 let $i=7;
 let $k=1;
-let $cmd=cat ./var/mysqld.2/data/percona_log_slow_slave_statements-slave.log | grep;
+let $cmd=cat $MYSQLTEST_VARDIR/mysqld.2/data/percona_log_slow_slave_statements-slave.log | grep;
 while($i)
 {
     let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;

=== 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 @@
+--slow_query_log_microseconds_timestamp

=== 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 @@
+show global variables like 'slow_query_log_microseconds_timestamp';
+Variable_name	Value
+slow_query_log_microseconds_timestamp	ON

=== 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 @@
+show global variables like 'slow_query_log_microseconds_timestamp';

=== 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 @@
+--use_global_long_query_time

=== 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 @@
+show global variables like 'use_global_long_query_time';
+Variable_name	Value
+use_global_long_query_time	ON

=== 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 @@
+show global variables like 'use_global_long_query_time';

=== 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 @@
 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
 --- a/sql/set_var.cc	2010-07-26 18:29:12.250113584 +0900
 +++ b/sql/set_var.cc	2010-07-26 18:29:35.724113196 +0900
-@@ -560,6 +560,8 @@
+@@ -561,6 +561,8 @@
  						     &opt_userstat_running);
  static sys_var_bool_ptr		sys_thread_statistics(&vars, "thread_statistics",
  						      &opt_thread_statistics);

=== 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 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
+diff -ruN /dev/null b/mysql-test/r/percona_bug643149.result
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ b/mysql-test/r/percona_bug643149.result	2010-11-25 23:52:28.000000000 +0300
 @@ -0,0 +1,16 @@
@@ -24,9 +25,10 @@
 +# 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 
 +# Profile_total: X.X Profile_total_cpu: X.X 
 +SET GLOBAL slow_query_log_file=@old_slow_query_log_file;
+diff -ruN /dev/null b/mysql-test/t/percona_bug643149.test
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ b/mysql-test/t/percona_bug643149.test	2010-11-25 23:52:08.000000000 +0300
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,50 @@
 +#
 +# This test suffers from server
 +# Bug#38124 "general_log_file" variable silently unset when using expression
@@ -77,6 +79,7 @@
 +  eval SET @@global.slow_query_log_file = '$my_var';
 +  --enable_query_log
 +}
+diff -ruN /dev/null b/patch_info/profiling_slow.info
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ b/patch_info/profiling_slow.info	2010-11-24 19:33:02.000000000 +0300
 @@ -0,0 +1,9 @@
@@ -89,6 +92,7 @@
 +Changelog
 [phone]
 +Initial implementation
+diff -ruN a/sql/log.cc b/sql/log.cc
 --- a/sql/log.cc	2010-11-24 19:33:02.000000000 +0300
 +++ b/sql/log.cc	2010-11-24 19:36:29.000000000 +0300
 @@ -2433,6 +2433,11 @@
@@ -103,6 +107,7 @@
      if (thd->db && strcmp(thd->db, db))
      {						// Database changed
        if (my_b_printf(&log_file,"use %s;\n",thd->db) == (uint) -1)
+diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc	2010-11-24 19:33:02.000000000 +0300
 +++ b/sql/mysqld.cc	2010-11-24 19:36:29.000000000 +0300
 @@ -5778,6 +5778,8 @@
@@ -131,9 +136,10 @@
  #endif
    {"relay-log", OPT_RELAY_LOG,
     "The location and name to use for relay logs.",
+diff -ruN a/sql/set_var.cc b/sql/set_var.cc
 --- a/sql/set_var.cc	2010-11-24 19:33:02.000000000 +0300
 +++ b/sql/set_var.cc	2010-11-24 19:36:29.000000000 +0300
-@@ -847,6 +847,10 @@
+@@ -848,6 +848,10 @@
                                        ulonglong(OPTION_PROFILING));
  static sys_var_thd_ulong	sys_profiling_history_size(&vars, "profiling_history_size",
  					      &SV::profiling_history_size);
@@ -144,6 +150,7 @@
  #endif
  
  /* Local state variables */
+diff -ruN a/sql/sql_class.h b/sql/sql_class.h
 --- a/sql/sql_class.h	2010-11-24 19:33:02.000000000 +0300
 +++ b/sql/sql_class.h	2010-11-24 19:36:29.000000000 +0300
 @@ -328,6 +328,8 @@
@@ -155,6 +162,7 @@
    ulong query_cache_type;
    ulong read_buff_size;
    ulong read_rnd_buff_size;
+diff -ruN a/sql/sql_profile.cc b/sql/sql_profile.cc
 --- a/sql/sql_profile.cc	2010-10-12 00:34:33.000000000 +0400
 +++ b/sql/sql_profile.cc	2010-11-25 16:09:12.000000000 +0300
 @@ -223,8 +223,22 @@
@@ -319,6 +327,7 @@
  /**
    Fill the information schema table, "query_profile", as defined in show.cc .
    There are two ways to get to this function:  Selecting from the information
+diff -ruN a/sql/sql_profile.h b/sql/sql_profile.h
 --- a/sql/sql_profile.h	2010-10-12 00:34:33.000000000 +0400
 +++ b/sql/sql_profile.h	2010-11-25 15:54:48.000000000 +0300
 @@ -165,11 +165,15 @@

=== 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 @@
  static void fix_myisam_max_sort_file_size(THD *thd, enum_var_type type);
  static void fix_max_binlog_size(THD *thd, enum_var_type type);
  static void fix_max_relay_log_size(THD *thd, enum_var_type type);
-@@ -570,9 +572,6 @@
+@@ -571,9 +573,6 @@
                                                &SV::div_precincrement);
  static sys_var_long_ptr	sys_rpl_recovery_rank(&vars, "rpl_recovery_rank",
  					      &rpl_recovery_rank);
@@ -129,7 +129,7 @@
  
  static sys_var_thd_ulong	sys_range_alloc_block_size(&vars, "range_alloc_block_size",
  						   &SV::range_alloc_block_size);
-@@ -638,14 +637,20 @@
+@@ -639,14 +638,20 @@
                                              NULL);
  
  #ifdef HAVE_QUERY_CACHE
@@ -155,7 +155,7 @@
  static sys_var_thd_bool
  sys_query_cache_wlock_invalidate(&vars, "query_cache_wlock_invalidate",
  				 &SV::query_cache_wlock_invalidate);
-@@ -929,6 +934,8 @@
+@@ -930,6 +935,8 @@
  #ifndef EMBEDDED_LIBRARY
  static sys_var_const_str_ptr    sys_repl_report_host(&vars, "report_host", &report_host);
  static sys_var_const_str_ptr    sys_repl_report_user(&vars, "report_user", &report_user);
@@ -164,7 +164,7 @@
  static sys_var_const_str_ptr    sys_repl_report_password(&vars, "report_password", &report_password);
  
  static uchar *slave_get_report_port(THD *thd)
-@@ -1239,10 +1246,9 @@
+@@ -1240,10 +1247,9 @@
  {}
  #endif /* HAVE_REPLICATION */
  
@@ -176,7 +176,7 @@
    ulong new_cache_size= query_cache.resize(query_cache_size);
  
    /*
-@@ -1256,11 +1262,35 @@
+@@ -1257,11 +1263,35 @@
  			query_cache_size, new_cache_size);
    
    query_cache_size= new_cache_size;
@@ -214,7 +214,7 @@
  static void fix_query_cache_min_res_unit(THD *thd, enum_var_type type)
  {
    query_cache_min_res_unit= 
-@@ -3634,6 +3664,16 @@
+@@ -3635,6 +3665,16 @@
    Functions to handle SET mysql_internal_variable=const_expr
  *****************************************************************************/
  

=== 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 @@
 @@ -6969,6 +6985,23 @@
     "Use microsecond time's precision in slow query log",
     (uchar**) &opt_slow_query_log_microseconds_timestamp, (uchar**) &opt_slow_query_log_microseconds_timestamp,
-    0, GET_BOOL, REQUIRED_ARG, 0, 0, 1, 0, 1, 0},
+    0, GET_BOOL, OPT_ARG, 0, 0, 1, 0, 1, 0},
 +#ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
 +  {"query_response_time_range_base", OPT_QRT_RANGE_BASE,
 +     "Select base of log for query_response_time ranges. WARNING: variable change affect only after flush",
@@ -670,7 +670,7 @@
 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
 --- a/sql/set_var.cc	2010-11-01 08:43:57.000000000 +0000
 +++ b/sql/set_var.cc	2010-11-01 08:52:40.000000000 +0000
-@@ -1006,6 +1006,14 @@
+@@ -1007,6 +1007,14 @@
  static sys_var_use_global_long_query_time sys_use_global_long_query_time;
  static sys_var_bool_ptr       sys_slow_query_log_microseconds_timestamp(&vars, "slow_query_log_microseconds_timestamp",
                                                         &opt_slow_query_log_microseconds_timestamp);

=== 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 @@
 +  {"log_slow_sp_statements", OPT_LOG_SLOW_SP_STATEMENTS,
 +   "Log slow statements executed by stored procedure to the slow log if it is open.",
 +   (uchar**) &opt_log_slow_sp_statements, (uchar**) &opt_log_slow_sp_statements,
-+   0, GET_BOOL, REQUIRED_ARG, 1, 0, 1, 0, 1, 0},
++   0, GET_BOOL, OPT_ARG, 1, 0, 1, 0, 1, 0},
 +  {"log_slow_timestamp_every", OPT_LOG_SLOW_TIMESTAMP_EVERY,
 +   "Timestamp is printed for all records of the slow log even if they are same time.",
 +   (uchar**) &opt_log_slow_timestamp_every, (uchar**) &opt_log_slow_timestamp_every,
-+   0, GET_BOOL, REQUIRED_ARG, 0, 0, 1, 0, 1, 0},
++   0, GET_BOOL, OPT_ARG, 0, 0, 1, 0, 1, 0},
 +  {"use_global_log_slow_control", OPT_USE_GLOBAL_LOG_SLOW_CONTROL,
 +    "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]",
 +   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, SLOG_UG_NONE, 0, 0},
 +  {"use_global_long_query_time", OPT_USE_GLOBAL_LONG_QUERY_TIME,
 +   "Control always use global long_query_time or local long_query_time.",
 +   (uchar**) &opt_use_global_long_query_time, (uchar**) &opt_use_global_long_query_time,
-+   0, GET_BOOL, REQUIRED_ARG, 0, 0, 1, 0, 1, 0},
++   0, GET_BOOL, OPT_ARG, 0, 0, 1, 0, 1, 0},
 +  {"slow_query_log_microseconds_timestamp", OPT_SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP,
 +   "Use microsecond time's precision in slow query log",
 +   (uchar**) &opt_slow_query_log_microseconds_timestamp, (uchar**) &opt_slow_query_log_microseconds_timestamp,
-+   0, GET_BOOL, REQUIRED_ARG, 0, 0, 1, 0, 1, 0},
++   0, GET_BOOL, OPT_ARG, 0, 0, 1, 0, 1, 0},
    {"lower_case_table_names", OPT_LOWER_CASE_TABLE_NAMES,
     "If set to 1, table names are stored in lowercase on disk and table names "
     "will be case-insensitive.  Should be set to 2 if you are using a case-"
@@ -641,7 +641,17 @@
    /*
      Default behavior for 4.1 and 5.0 is to treat NULL values as unequal
      when collecting index statistics for MyISAM tables.
-@@ -8458,6 +8504,41 @@
+@@ -8064,6 +8110,9 @@
+   return 0;
+ }
+ 
++/* defined in sql/setvar.cc */
++extern void use_global_long_query_time_update(bool enable);
++
+ 
+ my_bool
+ mysqld_get_one_option(int optid,
+@@ -8458,6 +8504,44 @@
    case OPT_BOOTSTRAP:
      opt_noacl=opt_bootstrap=1;
      break;
@@ -663,21 +673,24 @@
 +      exit(1);
 +    }
 +    break;
++  case OPT_USE_GLOBAL_LONG_QUERY_TIME:
++    use_global_long_query_time_update(opt_use_global_long_query_time == TRUE);
++    break;
 +  case OPT_USE_GLOBAL_LOG_SLOW_CONTROL:
 +    {
 +      ulong &v = global_system_variables.use_global_log_slow_control;
 +      v =  msl_flag_resolve_by_name(slog_use_global, argument, SLOG_UG_NONE, SLOG_UG_INVALID);
 +      if (v != SLOG_UG_NONE)
 +      {
-+	ulong mask = SLOG_UG_NONE;
-+	mask = ~mask;
-+	v = v & mask;
++	v = v & (~(SLOG_UG_NONE));
 +      }
 +      if (v == SLOG_UG_INVALID)
 +      {
 +	fprintf(stderr,"Invalid argument in use_global_log_slow_control: %s\n", argument);
 +	exit(1);
 +      }
++      use_global_long_query_time_update(
++	global_system_variables.use_global_log_slow_control & SLOG_UG_LONG_QUERY_TIME);
 +      break;
 +    }
    case OPT_SERVER_ID:
@@ -686,7 +699,7 @@
 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
 --- a/sql/set_var.cc	2010-08-04 02:24:33.000000000 +0900
 +++ b/sql/set_var.cc	2010-08-27 14:30:34.873021323 +0900
-@@ -160,6 +160,73 @@
+@@ -160,6 +160,74 @@
  
  static sys_var_chain vars = { NULL, NULL };
  
@@ -698,6 +711,7 @@
 +    log_slow_control = log_slow_control | SLOG_UG_LONG_QUERY_TIME;
 +  else
 +    log_slow_control = log_slow_control & (~(SLOG_UG_LONG_QUERY_TIME));
++  log_slow_control = log_slow_control & (~(SLOG_UG_NONE));
 +  if(0 == log_slow_control)
 +    log_slow_control = SLOG_UG_NONE;
 +}

=== 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 @@
 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
 --- a/sql/set_var.cc	2010-07-26 18:31:59.093062279 +0900
 +++ b/sql/set_var.cc	2010-07-26 18:34:10.210061358 +0900
-@@ -562,6 +562,8 @@
+@@ -563,6 +563,8 @@
  						      &opt_thread_statistics);
  static sys_var_bool_ptr		sys_optimizer_fix(&vars, "optimizer_fix",
  						  &opt_optimizer_fix);

=== 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 @@
 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
 --- a/sql/set_var.cc	2010-11-24 17:24:51.000000000 +0300
 +++ b/sql/set_var.cc	2010-11-24 17:31:34.000000000 +0300
-@@ -556,6 +556,10 @@
+@@ -557,6 +557,10 @@
  static sys_var_thd_ulong	sys_read_buff_size(&vars, "read_buffer_size",
  					   &SV::read_buff_size);
  static sys_var_opt_readonly	sys_readonly(&vars, "read_only", &opt_readonly);