Merge lp:~percona-dev/percona-server/release-5.1.47-11-control_global_slow-bug_fix into lp:percona-server/release-5.1.47-11

[Oleg Tsarev]

Fix bug 587834
https://bugs.launchpad.net/percona-server/+bug/587834

[Yasufumi Kinoshita (yasufumi-kinoshita)]

Did you test mysql-test really?

percona_slow_query_log-log_slow_verbosity still fails.

Is it intended? or break something?

I believed you did mysql-test for every requests.
But you seem not to do so.

Please do "mysql-test --suites=main,innodb" at least before requesting to merge.
Why should I build and test for every your merge suggestion?

[Oleg Tsarev (tsarev)]

Yes, NOW i test it. ./mysql-test-run doesn't run percona* tests, i run it manually.

[Yasufumi Kinoshita (yasufumi-kinoshita)]

There are still bug.... but approve it for now...

review: Approve

=== modified file 'control-global-slow.patch'
--- control-global-slow.patch	2010-05-27 23:11:03 +0000
+++ control-global-slow.patch	2010-06-02 02:36:26 +0000
@@ -137,19 +137,16 @@
  }
 -
 +#define SLOG_UG_SETUP(session,value,flag,global) do {   \
-+  if(value & flag == flag)                            \
-+    session = global;                                 \
++  if(value & flag) \
++    session = global; \
 +  } while(false);
  
  void log_slow_statement(THD *thd)
  {
-@@ -1698,6 +1701,21 @@
+@@ -1698,6 +1701,18 @@
    if (opt_use_global_long_query_time)
      thd->variables.long_query_time = global_system_variables.long_query_time;
  
-+  if (opt_use_global_long_query_time)
-+    thd->variables.long_query_time = global_system_variables.long_query_time;
-+
 +  /* use_global_log_slow_control */
 +  {
 +    system_variables const &g     = global_system_variables; // global                                                           

=== modified file 'mysql-test/percona_slow_query_log-control_global_slow-master.opt'
--- mysql-test/percona_slow_query_log-control_global_slow-master.opt	2010-05-27 23:14:07 +0000
+++ mysql-test/percona_slow_query_log-control_global_slow-master.opt	2010-06-02 02:36:26 +0000
@@ -1,1 +1,1 @@
---slow-query-log-file=percona_slow_query_log.log --long-query-time=1
\ No newline at end of file
+--slow-query-log-file=percona_slow_query_log-control_global_slow.log --long-query-time=1
\ No newline at end of file

=== modified file 'mysql-test/percona_slow_query_log-control_global_slow.result'
--- mysql-test/percona_slow_query_log-control_global_slow.result	2010-05-27 23:14:07 +0000
+++ mysql-test/percona_slow_query_log-control_global_slow.result	2010-06-02 02:36:26 +0000
@@ -8,5 +8,5 @@
 0
 set global use_global_log_slow_control=none;
 set global log_slow_verbosity=microtime;
-cat var/mysqld.1/data/percona_slow_query_log.log | grep "No InnoDB statistics available for this query" | wc -l
+cat var/mysqld.1/data/percona_slow_query_log-control_global_slow.log | grep "No InnoDB statistics available for this query" | wc -l
 1

=== modified file 'mysql-test/percona_slow_query_log-control_global_slow.test'
--- mysql-test/percona_slow_query_log-control_global_slow.test	2010-05-27 23:14:07 +0000
+++ mysql-test/percona_slow_query_log-control_global_slow.test	2010-06-02 02:36:26 +0000
@@ -5,6 +5,6 @@
 SELECT sleep(2);
 set global use_global_log_slow_control=none;
 set global log_slow_verbosity=microtime;
-let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep "No InnoDB statistics available for this query" | wc -l;
+let $cmd = cat var/mysqld.1/data/percona_slow_query_log-control_global_slow.log | grep "No InnoDB statistics available for this query" | wc -l;
 echo $cmd;
 exec $cmd;

=== modified file 'mysql-test/percona_slow_query_log-log_slow_filter-master.opt'
--- mysql-test/percona_slow_query_log-log_slow_filter-master.opt	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-log_slow_filter-master.opt	2010-06-02 02:36:26 +0000
@@ -1,1 +1,1 @@
---slow-query-log-file=percona_slow_query_log.log --long-query-time=1
\ No newline at end of file
+--slow-query-log-file=percona_slow_query_log-log_slow_filter.log --long-query-time=1
\ No newline at end of file

=== modified file 'mysql-test/percona_slow_query_log-log_slow_filter.result'
--- mysql-test/percona_slow_query_log-log_slow_filter.result	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-log_slow_filter.result	2010-06-02 02:36:26 +0000
@@ -19,5 +19,5 @@
 sleep(2)
 0
 drop table if exists t;
-cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l
+cat var/mysqld.1/data/percona_slow_query_log-log_slow_filter.log | grep Query_time | wc -l
 2

=== modified file 'mysql-test/percona_slow_query_log-log_slow_filter.test'
--- mysql-test/percona_slow_query_log-log_slow_filter.test	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-log_slow_filter.test	2010-06-02 02:36:26 +0000
@@ -22,6 +22,6 @@
 drop table if exists t;
 --enable_warnings
 
-let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l;
+let $cmd = cat var/mysqld.1/data/percona_slow_query_log-log_slow_filter.log | grep Query_time | wc -l;
 echo $cmd;
 exec $cmd;

=== modified file 'mysql-test/percona_slow_query_log-log_slow_verbosity-master.opt'
--- mysql-test/percona_slow_query_log-log_slow_verbosity-master.opt	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-log_slow_verbosity-master.opt	2010-06-02 02:36:26 +0000
@@ -1,1 +1,1 @@
---slow-query-log-file=percona_slow_query_log.log --long-query-time=1
\ No newline at end of file
+--slow-query-log-file=percona_slow_query_log-log_slow_verbosity.log --long-query-time=1
\ No newline at end of file

=== modified file 'mysql-test/percona_slow_query_log-log_slow_verbosity.result'
--- mysql-test/percona_slow_query_log-log_slow_verbosity.result	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-log_slow_verbosity.result	2010-06-02 02:36:26 +0000
@@ -5,5 +5,5 @@
 SELECT sleep(2);
 sleep(2)
 0
-cat var/mysqld.1/data/percona_slow_query_log.log | grep InnoDB | wc -l
+cat var/mysqld.1/data/percona_slow_query_log-log_slow_verbosity.log | grep "No InnoDB statistics available for this query" | wc -l
 1

=== modified file 'mysql-test/percona_slow_query_log-log_slow_verbosity.test'
--- mysql-test/percona_slow_query_log-log_slow_verbosity.test	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-log_slow_verbosity.test	2010-06-02 02:36:26 +0000
@@ -6,6 +6,6 @@
 
 SELECT sleep(2);
 
-let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep InnoDB | wc -l;
+let $cmd = cat var/mysqld.1/data/percona_slow_query_log-log_slow_verbosity.log | grep "No InnoDB statistics available for this query" | wc -l;
 echo $cmd;
 exec $cmd;

=== modified file 'mysql-test/percona_slow_query_log-long_query_time-master.opt'
--- mysql-test/percona_slow_query_log-long_query_time-master.opt	2010-05-26 14:18:37 +0000
+++ mysql-test/percona_slow_query_log-long_query_time-master.opt	2010-06-02 02:36:26 +0000
@@ -1,1 +1,1 @@
---slow-query-log-file=percona_slow_query_log.log --long-query-time=2
\ No newline at end of file
+--slow-query-log-file=percona_slow_query_log-long_query_time.log --long-query-time=2
\ No newline at end of file

=== modified file 'mysql-test/percona_slow_query_log-long_query_time.result'
--- mysql-test/percona_slow_query_log-long_query_time.result	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-long_query_time.result	2010-06-02 02:36:26 +0000
@@ -18,5 +18,5 @@
 sleep(5)
 0
 set long_query_time=2;
-cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l
+cat var/mysqld.1/data/percona_slow_query_log-long_query_time.log | grep Query_time | wc -l
 3

=== modified file 'mysql-test/percona_slow_query_log-long_query_time.test'
--- mysql-test/percona_slow_query_log-long_query_time.test	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-long_query_time.test	2010-06-02 02:36:26 +0000
@@ -12,6 +12,6 @@
 
 set long_query_time=2;
 
-let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l;
+let $cmd = cat var/mysqld.1/data/percona_slow_query_log-long_query_time.log | grep Query_time | wc -l;
 echo $cmd;
 exec $cmd;

=== modified file 'mysql-test/percona_slow_query_log-min_examined_row_limit-master.opt'
--- mysql-test/percona_slow_query_log-min_examined_row_limit-master.opt	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-min_examined_row_limit-master.opt	2010-06-02 02:36:26 +0000
@@ -1,1 +1,1 @@
---slow-query-log-file=percona_slow_query_log.log --long-query-time=1
\ No newline at end of file
+--slow-query-log-file=percona_slow_query_log-min_examined_row_limit.log --long-query-time=1
\ No newline at end of file

=== modified file 'mysql-test/percona_slow_query_log-min_examined_row_limit.result'
--- mysql-test/percona_slow_query_log-min_examined_row_limit.result	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-min_examined_row_limit.result	2010-06-02 02:36:26 +0000
@@ -19,5 +19,5 @@
 sleep(2)
 0
 drop table if exists t;
-cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l
+cat var/mysqld.1/data/percona_slow_query_log-min_examined_row_limit.log | grep Query_time | wc -l
 2

=== modified file 'mysql-test/percona_slow_query_log-min_examined_row_limit.test'
--- mysql-test/percona_slow_query_log-min_examined_row_limit.test	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-min_examined_row_limit.test	2010-06-02 02:36:26 +0000
@@ -22,6 +22,6 @@
 drop table if exists t;
 --enable_warnings
 
-let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l;
+let $cmd = cat var/mysqld.1/data/percona_slow_query_log-min_examined_row_limit.log | grep Query_time | wc -l;
 echo $cmd;
 exec $cmd;

=== modified file 'mysql-test/percona_slow_query_log-use_global_long_query_time-master.opt'
--- mysql-test/percona_slow_query_log-use_global_long_query_time-master.opt	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-use_global_long_query_time-master.opt	2010-06-02 02:36:26 +0000
@@ -1,1 +1,1 @@
---slow-query-log-file=percona_slow_query_log.log --long-query-time=2
\ No newline at end of file
+--slow-query-log-file=percona_slow_query_log-use_global_long_query_time.log --long-query-time=2
\ No newline at end of file

=== modified file 'mysql-test/percona_slow_query_log-use_global_long_query_time.result'
--- mysql-test/percona_slow_query_log-use_global_long_query_time.result	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-use_global_long_query_time.result	2010-06-02 02:36:26 +0000
@@ -20,5 +20,5 @@
 0
 set global long_query_time=2;
 set global use_global_long_query_time=0;
-cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l
+cat var/mysqld.1/data/percona_slow_query_log-use_global_long_query_time.log | grep Query_time | wc -l
 3

=== modified file 'mysql-test/percona_slow_query_log-use_global_long_query_time.test'
--- mysql-test/percona_slow_query_log-use_global_long_query_time.test	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-use_global_long_query_time.test	2010-06-02 02:36:26 +0000
@@ -14,6 +14,6 @@
 set global long_query_time=2;
 set global use_global_long_query_time=0;
 
-let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l;
+let $cmd = cat var/mysqld.1/data/percona_slow_query_log-use_global_long_query_time.log | grep Query_time | wc -l;
 echo $cmd;
 exec $cmd;