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

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

  1. release-5.1.47-11-control_global_slow-bug_fix
  2. Merge into release-5.1.47-11
Proposed by Oleg Tsarev
Status: Merged
Merged at revision: 22
Proposed branch: lp:~percona-dev/percona-server/release-5.1.47-11-control_global_slow-bug_fix
Merge into: lp:percona-server/release-5.1.47-11
Diff against target: 218 lines (+21/-24)
19 files modified
control-global-slow.patch (+3/-6)
mysql-test/percona_slow_query_log-control_global_slow-master.opt (+1/-1)
mysql-test/percona_slow_query_log-control_global_slow.result (+1/-1)
mysql-test/percona_slow_query_log-control_global_slow.test (+1/-1)
mysql-test/percona_slow_query_log-log_slow_filter-master.opt (+1/-1)
mysql-test/percona_slow_query_log-log_slow_filter.result (+1/-1)
mysql-test/percona_slow_query_log-log_slow_filter.test (+1/-1)
mysql-test/percona_slow_query_log-log_slow_verbosity-master.opt (+1/-1)
mysql-test/percona_slow_query_log-log_slow_verbosity.result (+1/-1)
mysql-test/percona_slow_query_log-log_slow_verbosity.test (+1/-1)
mysql-test/percona_slow_query_log-long_query_time-master.opt (+1/-1)
mysql-test/percona_slow_query_log-long_query_time.result (+1/-1)
mysql-test/percona_slow_query_log-long_query_time.test (+1/-1)
mysql-test/percona_slow_query_log-min_examined_row_limit-master.opt (+1/-1)
mysql-test/percona_slow_query_log-min_examined_row_limit.result (+1/-1)
mysql-test/percona_slow_query_log-min_examined_row_limit.test (+1/-1)
mysql-test/percona_slow_query_log-use_global_long_query_time-master.opt (+1/-1)
mysql-test/percona_slow_query_log-use_global_long_query_time.result (+1/-1)
mysql-test/percona_slow_query_log-use_global_long_query_time.test (+1/-1)
To merge this branch: bzr merge lp:~percona-dev/percona-server/release-5.1.47-11-control_global_slow-bug_fix
Reviewer Review Type Date Requested Status
Yasufumi Kinoshita (community) Approve
Review via email: mp+26409@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Yasufumi Kinoshita (yasufumi-kinoshita) wrote :

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?

Revision history for this message
Oleg Tsarev (tsarev) wrote :

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

Revision history for this message
Yasufumi Kinoshita (yasufumi-kinoshita) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
137 }137 }
138-138-
139+#define SLOG_UG_SETUP(session,value,flag,global) do { \139+#define SLOG_UG_SETUP(session,value,flag,global) do { \
140+ if(value & flag == flag) \140+ if(value & flag) \
141+ session = global; \141+ session = global; \
142+ } while(false);142+ } while(false);
143 143
144 void log_slow_statement(THD *thd)144 void log_slow_statement(THD *thd)
145 {145 {
146@@ -1698,6 +1701,21 @@146@@ -1698,6 +1701,18 @@
147 if (opt_use_global_long_query_time)147 if (opt_use_global_long_query_time)
148 thd->variables.long_query_time = global_system_variables.long_query_time;148 thd->variables.long_query_time = global_system_variables.long_query_time;
149 149
150+ if (opt_use_global_long_query_time)
151+ thd->variables.long_query_time = global_system_variables.long_query_time;
152+
153+ /* use_global_log_slow_control */150+ /* use_global_log_slow_control */
154+ {151+ {
155+ system_variables const &g = global_system_variables; // global 152+ system_variables const &g = global_system_variables; // global
156153
=== 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 @@
1--slow-query-log-file=percona_slow_query_log.log --long-query-time=1
2\ No newline at end of file1\ No newline at end of file
2--slow-query-log-file=percona_slow_query_log-control_global_slow.log --long-query-time=1
3\ No newline at end of file3\ No newline at end of file
44
=== 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 @@
8080
9set global use_global_log_slow_control=none;9set global use_global_log_slow_control=none;
10set global log_slow_verbosity=microtime;10set global log_slow_verbosity=microtime;
11cat var/mysqld.1/data/percona_slow_query_log.log | grep "No InnoDB statistics available for this query" | wc -l11cat var/mysqld.1/data/percona_slow_query_log-control_global_slow.log | grep "No InnoDB statistics available for this query" | wc -l
121121
1313
=== 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 @@
5SELECT sleep(2);5SELECT sleep(2);
6set global use_global_log_slow_control=none;6set global use_global_log_slow_control=none;
7set global log_slow_verbosity=microtime;7set global log_slow_verbosity=microtime;
8let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep "No InnoDB statistics available for this query" | wc -l;8let $cmd = cat var/mysqld.1/data/percona_slow_query_log-control_global_slow.log | grep "No InnoDB statistics available for this query" | wc -l;
9echo $cmd;9echo $cmd;
10exec $cmd;10exec $cmd;
1111
=== 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 @@
1--slow-query-log-file=percona_slow_query_log.log --long-query-time=1
2\ No newline at end of file1\ No newline at end of file
2--slow-query-log-file=percona_slow_query_log-log_slow_filter.log --long-query-time=1
3\ No newline at end of file3\ No newline at end of file
44
=== 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 @@
19sleep(2)19sleep(2)
200200
21drop table if exists t;21drop table if exists t;
22cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l22cat var/mysqld.1/data/percona_slow_query_log-log_slow_filter.log | grep Query_time | wc -l
232232
2424
=== 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 @@
22drop table if exists t;22drop table if exists t;
23--enable_warnings23--enable_warnings
2424
25let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l;25let $cmd = cat var/mysqld.1/data/percona_slow_query_log-log_slow_filter.log | grep Query_time | wc -l;
26echo $cmd;26echo $cmd;
27exec $cmd;27exec $cmd;
2828
=== 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 @@
1--slow-query-log-file=percona_slow_query_log.log --long-query-time=1
2\ No newline at end of file1\ No newline at end of file
2--slow-query-log-file=percona_slow_query_log-log_slow_verbosity.log --long-query-time=1
3\ No newline at end of file3\ No newline at end of file
44
=== 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 @@
5SELECT sleep(2);5SELECT sleep(2);
6sleep(2)6sleep(2)
7070
8cat var/mysqld.1/data/percona_slow_query_log.log | grep InnoDB | wc -l8cat var/mysqld.1/data/percona_slow_query_log-log_slow_verbosity.log | grep "No InnoDB statistics available for this query" | wc -l
9191
1010
=== 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 @@
66
7SELECT sleep(2);7SELECT sleep(2);
88
9let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep InnoDB | wc -l;9let $cmd = cat var/mysqld.1/data/percona_slow_query_log-log_slow_verbosity.log | grep "No InnoDB statistics available for this query" | wc -l;
10echo $cmd;10echo $cmd;
11exec $cmd;11exec $cmd;
1212
=== 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 @@
1--slow-query-log-file=percona_slow_query_log.log --long-query-time=2
2\ No newline at end of file1\ No newline at end of file
2--slow-query-log-file=percona_slow_query_log-long_query_time.log --long-query-time=2
3\ No newline at end of file3\ No newline at end of file
44
=== 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 @@
18sleep(5)18sleep(5)
190190
20set long_query_time=2;20set long_query_time=2;
21cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l21cat var/mysqld.1/data/percona_slow_query_log-long_query_time.log | grep Query_time | wc -l
223223
2323
=== 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 @@
1212
13set long_query_time=2;13set long_query_time=2;
1414
15let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l;15let $cmd = cat var/mysqld.1/data/percona_slow_query_log-long_query_time.log | grep Query_time | wc -l;
16echo $cmd;16echo $cmd;
17exec $cmd;17exec $cmd;
1818
=== 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 @@
1--slow-query-log-file=percona_slow_query_log.log --long-query-time=1
2\ No newline at end of file1\ No newline at end of file
2--slow-query-log-file=percona_slow_query_log-min_examined_row_limit.log --long-query-time=1
3\ No newline at end of file3\ No newline at end of file
44
=== 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 @@
19sleep(2)19sleep(2)
200200
21drop table if exists t;21drop table if exists t;
22cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l22cat var/mysqld.1/data/percona_slow_query_log-min_examined_row_limit.log | grep Query_time | wc -l
232232
2424
=== 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 @@
22drop table if exists t;22drop table if exists t;
23--enable_warnings23--enable_warnings
2424
25let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l;25let $cmd = cat var/mysqld.1/data/percona_slow_query_log-min_examined_row_limit.log | grep Query_time | wc -l;
26echo $cmd;26echo $cmd;
27exec $cmd;27exec $cmd;
2828
=== 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 @@
1--slow-query-log-file=percona_slow_query_log.log --long-query-time=2
2\ No newline at end of file1\ No newline at end of file
2--slow-query-log-file=percona_slow_query_log-use_global_long_query_time.log --long-query-time=2
3\ No newline at end of file3\ No newline at end of file
44
=== 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 @@
200200
21set global long_query_time=2;21set global long_query_time=2;
22set global use_global_long_query_time=0;22set global use_global_long_query_time=0;
23cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l23cat var/mysqld.1/data/percona_slow_query_log-use_global_long_query_time.log | grep Query_time | wc -l
243243
2525
=== 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 @@
14set global long_query_time=2;14set global long_query_time=2;
15set global use_global_long_query_time=0;15set global use_global_long_query_time=0;
1616
17let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l;17let $cmd = cat var/mysqld.1/data/percona_slow_query_log-use_global_long_query_time.log | grep Query_time | wc -l;
18echo $cmd;18echo $cmd;
19exec $cmd;19exec $cmd;

Subscribers

People subscribed via source and target branches

to all changes: