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

Proposed by Oleg Tsarev
Status: Merged
Approved by: Vadim Tkachenko
Approved revision: no longer in the source branch.
Merged at revision: 46
Proposed branch: lp:~percona-dev/percona-server/release-5.1.47-11-fix_slow_query_log_test
Merge into: lp:percona-server/release-5.1.47-11
Diff against target: 75 lines (+12/-0)
4 files modified
mysql-test/percona_slow_query_log-log_slow_filter.result (+2/-0)
mysql-test/percona_slow_query_log-log_slow_filter.test (+4/-0)
mysql-test/percona_slow_query_log-min_examined_row_limit.result (+2/-0)
mysql-test/percona_slow_query_log-min_examined_row_limit.test (+4/-0)
To merge this branch: bzr merge lp:~percona-dev/percona-server/release-5.1.47-11-fix_slow_query_log_test
Reviewer Review Type Date Requested Status
Percona developers Pending
Review via email: mp+27801@code.launchpad.net

Description of the change

fix slow query log (bug 588175)

To post a comment you must log in.
Revision history for this message
Vadim Tkachenko (vadim-tk) wrote :

Does it really fix problem ?

This is similar to FLUSH LOGS; functionality ?

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

I think, this fix trouble with create table/insert in slow query log.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysql-test/percona_slow_query_log-log_slow_filter.result'
2--- mysql-test/percona_slow_query_log-log_slow_filter.result 2010-05-31 10:55:54 +0000
3+++ mysql-test/percona_slow_query_log-log_slow_filter.result 2010-06-17 07:27:29 +0000
4@@ -1,3 +1,4 @@
5+SET GLOBAL SLOW_QUERY_LOG=OFF;
6 drop table if exists t;
7 # Create test table
8 create table t(id INT PRIMARY KEY) engine=InnoDB;
9@@ -5,6 +6,7 @@
10 insert into t values(1);
11 insert into t values(2);
12 insert into t values(3);
13+SET GLOBAL SLOW_QUERY_LOG=ON;
14 SELECT sleep(2);
15 sleep(2)
16 0
17
18=== modified file 'mysql-test/percona_slow_query_log-log_slow_filter.test'
19--- mysql-test/percona_slow_query_log-log_slow_filter.test 2010-05-31 10:55:54 +0000
20+++ mysql-test/percona_slow_query_log-log_slow_filter.test 2010-06-17 07:27:29 +0000
21@@ -1,5 +1,7 @@
22 source include/have_innodb.inc;
23
24+SET GLOBAL SLOW_QUERY_LOG=OFF;
25+
26 --disable_warnings
27 drop table if exists t;
28 --enable_warnings
29@@ -11,6 +13,8 @@
30 insert into t values(2);
31 insert into t values(3);
32
33+SET GLOBAL SLOW_QUERY_LOG=ON;
34+
35 SELECT sleep(2);
36
37 set log_slow_filter=full_join;
38
39=== modified file 'mysql-test/percona_slow_query_log-min_examined_row_limit.result'
40--- mysql-test/percona_slow_query_log-min_examined_row_limit.result 2010-05-31 10:55:54 +0000
41+++ mysql-test/percona_slow_query_log-min_examined_row_limit.result 2010-06-17 07:27:29 +0000
42@@ -1,3 +1,4 @@
43+SET GLOBAL SLOW_QUERY_LOG=OFF;
44 drop table if exists t;
45 # Create test table
46 create table t(id INT PRIMARY KEY) engine=InnoDB;
47@@ -5,6 +6,7 @@
48 insert into t values(1);
49 insert into t values(2);
50 insert into t values(3);
51+SET GLOBAL SLOW_QUERY_LOG=ON;
52 SELECT sleep(2);
53 sleep(2)
54 0
55
56=== modified file 'mysql-test/percona_slow_query_log-min_examined_row_limit.test'
57--- mysql-test/percona_slow_query_log-min_examined_row_limit.test 2010-05-31 10:55:54 +0000
58+++ mysql-test/percona_slow_query_log-min_examined_row_limit.test 2010-06-17 07:27:29 +0000
59@@ -1,5 +1,7 @@
60 source include/have_innodb.inc;
61
62+SET GLOBAL SLOW_QUERY_LOG=OFF;
63+
64 --disable_warnings
65 drop table if exists t;
66 --enable_warnings
67@@ -11,6 +13,8 @@
68 insert into t values(2);
69 insert into t values(3);
70
71+SET GLOBAL SLOW_QUERY_LOG=ON;
72+
73 SELECT sleep(2);
74
75 set min_examined_row_limit=5;

Subscribers

People subscribed via source and target branches

to all changes: