Merge lp:~gl-az/percona-server/bug1016991-5.6 into lp:percona-server/5.6

[George Ormond Lorch III]

bug 1016991 - long_query_time not respected when slow_query_log_use_global_control = all

#defines of values as (1ULL << something) were changed to an enum of 'something'
without correcting other code by adding shifting where those values were used in
update_slow_query_log_use_global_control().

jenkins:
http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/535/
and
http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/536/

There are several failures in other slow log tests that are not related to this issue/fix that clear themselves on subsequent runs (as well as re-appear elsewhere) and are documented in the following bugs:
https://bugs.launchpad.net/percona-server/+bug/1098857
https://bugs.launchpad.net/percona-server/+bug/1163680
https://bugs.launchpad.net/percona-server/5.5/+bug/1287299

[Sergei Glushchenko (sergei.glushchenko)]

Approve

review: Approve (g2)

[Alexey Kopytov (akopytov)]

review: Needs Fixing

[George Ormond Lorch III (gl-az)]

Same comments as 5.5 but no new jenkins

[Alexey Kopytov (akopytov)]

review: Approve

=== added file 'mysql-test/r/percona_bug1016991.result'
--- mysql-test/r/percona_bug1016991.result	1970-01-01 00:00:00 +0000
+++ mysql-test/r/percona_bug1016991.result	2014-03-18 17:52:41 +0000
@@ -0,0 +1,13 @@
+[log_start.inc] percona_slow_extended_query_log_1
+SET GLOBAL long_query_time=10000;
+SELECT 1;
+1
+1
+SET GLOBAL long_query_time=0;
+SELECT 1;
+1
+1
+[log_stop.inc] percona_slow_extended_query_log_1
+[log_grep.inc] file: percona_slow_extended_query_log_1 pattern: ^# Time: \d{6} (\d| )\d:\d\d:\d\d$
+[log_grep.inc] lines:   1
+SET GLOBAL long_query_time=default;

=== added file 'mysql-test/t/percona_bug1016991-master.opt'
--- mysql-test/t/percona_bug1016991-master.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/t/percona_bug1016991-master.opt	2014-03-18 17:52:41 +0000
@@ -0,0 +1,1 @@
+--slow_query_log_use_global_control=all

=== added file 'mysql-test/t/percona_bug1016991.test'
--- mysql-test/t/percona_bug1016991.test	1970-01-01 00:00:00 +0000
+++ mysql-test/t/percona_bug1016991.test	2014-03-18 17:52:41 +0000
@@ -0,0 +1,20 @@
+#
+# bug 1016991 - long_query_time not respected when slow_query_log_use_global_control = all
+# 
+--let log_file=percona_slow_extended_query_log_1
+--source include/log_start.inc
+
+# this one should never show in log
+SET GLOBAL long_query_time=10000;
+SELECT 1;
+
+# with bug, this would never show in log but should
+SET GLOBAL long_query_time=0;
+SELECT 1;
+
+--source include/log_stop.inc
+--let grep_pattern= ^# Time: \d{6} (\d| )\d:\d\d:\d\d\$
+--source include/log_grep.inc
+
+SET GLOBAL long_query_time=default;
+--source include/log_cleanup.inc

=== modified file 'sql/sys_vars.cc'
--- sql/sys_vars.cc	2014-03-03 17:51:33 +0000
+++ sql/sys_vars.cc	2014-03-18 17:52:41 +0000
@@ -4159,8 +4159,9 @@
   if(opt_slow_query_log_use_global_control & (ULL(1) << SLOG_UG_ALL))
   {
     opt_slow_query_log_use_global_control=
-      SLOG_UG_LOG_SLOW_FILTER | SLOG_UG_LOG_SLOW_RATE_LIMIT | SLOG_UG_LOG_SLOW_VERBOSITY |
-      SLOG_UG_LONG_QUERY_TIME | SLOG_UG_MIN_EXAMINED_ROW_LIMIT;
+      (1ULL << SLOG_UG_LOG_SLOW_FILTER) | (1ULL << SLOG_UG_LOG_SLOW_RATE_LIMIT)
+      | (1ULL << SLOG_UG_LOG_SLOW_VERBOSITY) | (1ULL << SLOG_UG_LONG_QUERY_TIME)
+      | (1ULL << SLOG_UG_MIN_EXAMINED_ROW_LIMIT);
   }
   return false;
 }