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
=== modified file 'mysql-test/percona_slow_query_log-log_slow_filter.result'
--- mysql-test/percona_slow_query_log-log_slow_filter.result 2010-05-31 10:55:54 +0000
+++ mysql-test/percona_slow_query_log-log_slow_filter.result 2010-06-17 07:27:29 +0000
@@ -1,3 +1,4 @@
1SET GLOBAL SLOW_QUERY_LOG=OFF;
1drop table if exists t;2drop table if exists t;
2# Create test table3# Create test table
3create table t(id INT PRIMARY KEY) engine=InnoDB;4create table t(id INT PRIMARY KEY) engine=InnoDB;
@@ -5,6 +6,7 @@
5insert into t values(1);6insert into t values(1);
6insert into t values(2);7insert into t values(2);
7insert into t values(3);8insert into t values(3);
9SET GLOBAL SLOW_QUERY_LOG=ON;
8SELECT sleep(2);10SELECT sleep(2);
9sleep(2)11sleep(2)
100120
1113
=== modified file 'mysql-test/percona_slow_query_log-log_slow_filter.test'
--- mysql-test/percona_slow_query_log-log_slow_filter.test 2010-05-31 10:55:54 +0000
+++ mysql-test/percona_slow_query_log-log_slow_filter.test 2010-06-17 07:27:29 +0000
@@ -1,5 +1,7 @@
1source include/have_innodb.inc;1source include/have_innodb.inc;
22
3SET GLOBAL SLOW_QUERY_LOG=OFF;
4
3--disable_warnings5--disable_warnings
4drop table if exists t;6drop table if exists t;
5--enable_warnings7--enable_warnings
@@ -11,6 +13,8 @@
11insert into t values(2);13insert into t values(2);
12insert into t values(3);14insert into t values(3);
1315
16SET GLOBAL SLOW_QUERY_LOG=ON;
17
14SELECT sleep(2);18SELECT sleep(2);
1519
16set log_slow_filter=full_join;20set log_slow_filter=full_join;
1721
=== 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-31 10:55:54 +0000
+++ mysql-test/percona_slow_query_log-min_examined_row_limit.result 2010-06-17 07:27:29 +0000
@@ -1,3 +1,4 @@
1SET GLOBAL SLOW_QUERY_LOG=OFF;
1drop table if exists t;2drop table if exists t;
2# Create test table3# Create test table
3create table t(id INT PRIMARY KEY) engine=InnoDB;4create table t(id INT PRIMARY KEY) engine=InnoDB;
@@ -5,6 +6,7 @@
5insert into t values(1);6insert into t values(1);
6insert into t values(2);7insert into t values(2);
7insert into t values(3);8insert into t values(3);
9SET GLOBAL SLOW_QUERY_LOG=ON;
8SELECT sleep(2);10SELECT sleep(2);
9sleep(2)11sleep(2)
100120
1113
=== 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-31 10:55:54 +0000
+++ mysql-test/percona_slow_query_log-min_examined_row_limit.test 2010-06-17 07:27:29 +0000
@@ -1,5 +1,7 @@
1source include/have_innodb.inc;1source include/have_innodb.inc;
22
3SET GLOBAL SLOW_QUERY_LOG=OFF;
4
3--disable_warnings5--disable_warnings
4drop table if exists t;6drop table if exists t;
5--enable_warnings7--enable_warnings
@@ -11,6 +13,8 @@
11insert into t values(2);13insert into t values(2);
12insert into t values(3);14insert into t values(3);
1315
16SET GLOBAL SLOW_QUERY_LOG=ON;
17
14SELECT sleep(2);18SELECT sleep(2);
1519
16set min_examined_row_limit=5;20set min_examined_row_limit=5;

Subscribers

People subscribed via source and target branches

to all changes: