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

Merge lp:~percona-dev/percona-server/release-5.1.54-bug-fix-695373 into lp:percona-server/release-5.1.54-12

  1. release-5.1.54-bug-fix-695373
  2. Merge into 5.1.54
Proposed by Oleg Tsarev
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 183
Proposed branch: lp:~percona-dev/percona-server/release-5.1.54-bug-fix-695373
Merge into: lp:percona-server/release-5.1.54-12
Diff against target: 270 lines (+33/-4)
20 files modified
mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow.result (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow.test (+1/-1)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.result (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.test (+1/-1)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.result (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.test (+1/-1)
mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.result (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.test (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.result (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.test (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.result (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.test (+1/-1)
mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test (+2/-0)
mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.result (+2/-0)
mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test (+6/-0)
mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.result (+2/-0)
mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test (+6/-0)
mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.result (+1/-0)
mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.test (+1/-0)
To merge this branch: bzr merge lp:~percona-dev/percona-server/release-5.1.54-bug-fix-695373
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+44859@code.launchpad.net

Description of the change

Sometime test percona_slow_extended-log_slow_verbosity are failed.
This test run long query(SELECT sleep(2)), and than analyze slow query log (search string "No InnoDB statistics available for this query").
You can see bug #695373 - first run of test doesn't string "No InnoDB... " instead of one, but retry run found two string instead of one.
I think reason of that - script searchs string in slow query log BEFORE this string was wrote to log by mysql.

I add FLUSH LOGS, and now test work fine.

Similar changes for tests:
  percona_slow_extended-control_global_slow
  percona_slow_extended-log_slow_filter
  percona_slow_extended-log_slow_verbosity
  percona_slow_extended-long_query_time
  percona_slow_extended-microseconds_in_slow_extended
  percona_slow_extended-min_examined_row_limit
  percona_slow_extended-slave_innodb_stats
  percona_slow_extended-slave_statements-and-use_global_long_query_time
  percona_slow_extended-slave_statements
  percona_slow_extended-use_global_long_query_time

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow.result 2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow.result 2010-12-29 19:11:55 +0000
@@ -8,4 +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;
11FLUSH LOGS;
111121
1213
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow.test 2010-12-24 16:44:23 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow.test 2010-12-29 19:11:55 +0000
@@ -6,7 +6,7 @@
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;
88
9FLUSH LOGS;
9--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-control_global_slow.log10--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-control_global_slow.log
10--let grep_pattern = No InnoDB statistics available for this query11--let grep_pattern = No InnoDB statistics available for this query
11
12--source include/grep.inc12--source include/grep.inc
1313
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.result 2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.result 2010-12-29 19:11:55 +0000
@@ -21,4 +21,5 @@
21sleep(2)21sleep(2)
220220
23drop table if exists t;23drop table if exists t;
24FLUSH LOGS;
242252
2526
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.test 2010-12-24 16:44:23 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.test 2010-12-29 19:11:55 +0000
@@ -26,7 +26,7 @@
26drop table if exists t;26drop table if exists t;
27--enable_warnings27--enable_warnings
2828
29FLUSH LOGS;
29--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-log_slow_filter.log30--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-log_slow_filter.log
30--let grep_pattern = Query_time31--let grep_pattern = Query_time
31
32--source include/grep.inc32--source include/grep.inc
3333
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.result 2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.result 2010-12-29 19:11:55 +0000
@@ -5,4 +5,5 @@
5SELECT sleep(2);5SELECT sleep(2);
6sleep(2)6sleep(2)
7070
8FLUSH LOGS;
8191
910
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.test 2010-12-24 16:44:23 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.test 2010-12-29 19:11:55 +0000
@@ -6,7 +6,7 @@
66
7SELECT sleep(2);7SELECT sleep(2);
88
9FLUSH LOGS;
9--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-log_slow_verbosity.log10--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-log_slow_verbosity.log
10--let grep_pattern = No InnoDB statistics available for this query11--let grep_pattern = No InnoDB statistics available for this query
11
12--source include/grep.inc12--source include/grep.inc
1313
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.result 2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.result 2010-12-29 19:11:55 +0000
@@ -18,4 +18,5 @@
18sleep(5)18sleep(5)
190190
20set long_query_time=2;20set long_query_time=2;
21FLUSH LOGS;
213223
2223
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.test 2010-12-24 16:44:23 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.test 2010-12-29 19:11:55 +0000
@@ -12,6 +12,7 @@
1212
13set long_query_time=2;13set long_query_time=2;
1414
15FLUSH LOGS;
15--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-long_query_time.log16--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-long_query_time.log
16--let grep_pattern = Query_time17--let grep_pattern = Query_time
17--source include/grep.inc18--source include/grep.inc
1819
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.result 2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.result 2010-12-29 19:11:55 +0000
@@ -6,5 +6,6 @@
6sleep(2)6sleep(2)
7070
8set global slow_query_log_microseconds_timestamp=OFF;8set global slow_query_log_microseconds_timestamp=OFF;
9FLUSH LOGS;
91101
102112
1112
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.test 2010-12-24 16:44:23 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.test 2010-12-29 19:11:55 +0000
@@ -8,6 +8,7 @@
88
9set global slow_query_log_microseconds_timestamp=OFF;9set global slow_query_log_microseconds_timestamp=OFF;
1010
11FLUSH LOGS;
11--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log12--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log
12--let grep_pattern = # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+.[0-9]+13--let grep_pattern = # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+.[0-9]+
13--source include/grep.inc14--source include/grep.inc
1415
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.result 2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.result 2010-12-29 19:11:55 +0000
@@ -21,4 +21,5 @@
21sleep(2)21sleep(2)
220220
23drop table if exists t;23drop table if exists t;
24FLUSH LOGS;
242252
2526
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.test 2010-12-24 16:44:23 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.test 2010-12-29 19:11:55 +0000
@@ -26,7 +26,7 @@
26drop table if exists t;26drop table if exists t;
27--enable_warnings27--enable_warnings
2828
29FLUSH LOGS;
29--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-min_examined_row_limit.log30--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-min_examined_row_limit.log
30--let grep_pattern = Query_time31--let grep_pattern = Query_time
31--source include/grep.inc32--source include/grep.inc
32
3333
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result 2010-11-18 12:38:25 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result 2010-12-29 19:11:55 +0000
@@ -18,4 +18,5 @@
18START SLAVE;18START SLAVE;
19INSERT INTO t SELECT t.id,t.data from t;19INSERT INTO t SELECT t.id,t.data from t;
20DROP TABLE IF EXISTS t;20DROP TABLE IF EXISTS t;
21FLUSH LOGS;
214224
2223
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test 2010-12-24 16:44:23 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test 2010-12-29 19:11:55 +0000
@@ -41,6 +41,8 @@
41DROP TABLE IF EXISTS t;41DROP TABLE IF EXISTS t;
42sync_slave_with_master;42sync_slave_with_master;
4343
44connection slave;
45FLUSH LOGS;
44--let grep_file = $MYSQLTEST_VARDIR/mysqld.2/mysqld-slow.log46--let grep_file = $MYSQLTEST_VARDIR/mysqld.2/mysqld-slow.log
45--let grep_pattern = InnoDB_IO_r_ops47--let grep_pattern = InnoDB_IO_r_ops
46--source include/grep.inc48--source include/grep.inc
4749
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.result 2010-11-18 11:36:02 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.result 2010-12-29 19:11:55 +0000
@@ -75,12 +75,14 @@
75use_global_long_query_time ON75use_global_long_query_time ON
76set global long_query_time=1;76set global long_query_time=1;
77set global use_global_long_query_time=0;77set global use_global_long_query_time=0;
78FLUSH LOGS;
78# Analyse master slow_query_log79# Analyse master slow_query_log
790800
800810
810820
820830
830840
85FLUSH LOGS;
84# Analyse slave slow_query_log86# Analyse slave slow_query_log
850870
860880
8789
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test 2010-12-24 16:44:23 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test 2010-12-29 19:11:55 +0000
@@ -75,6 +75,9 @@
75set global long_query_time=1;75set global long_query_time=1;
76set global use_global_long_query_time=0;76set global use_global_long_query_time=0;
7777
78connection master;
79FLUSH LOGS;
80
78-- echo # Analyse master slow_query_log81-- echo # Analyse master slow_query_log
79let $i=5;82let $i=5;
80let $k=1;83let $k=1;
@@ -87,6 +90,9 @@
87 inc $k;90 inc $k;
88}91}
8992
93connection slave;
94FLUSH LOGS;
95
90-- echo # Analyse slave slow_query_log96-- echo # Analyse slave slow_query_log
91let $i=5;97let $i=5;
92let $k=1;98let $k=1;
9399
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.result 2010-11-05 11:47:33 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.result 2010-12-29 19:11:55 +0000
@@ -64,6 +64,7 @@
64INSERT INTO t VALUES (7);64INSERT INTO t VALUES (7);
65# Read information about master binlog65# Read information about master binlog
66# Sync slave(7) thread66# Sync slave(7) thread
67FLUSH LOGS;
67# Analyse master slow_query_log68# Analyse master slow_query_log
681691
691701
@@ -72,6 +73,7 @@
721731
731741
741751
76FLUSH LOGS;
75# Analyse slave slow_query_log77# Analyse slave slow_query_log
760780
770790
7880
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test 2010-12-24 16:44:23 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test 2010-12-29 19:11:55 +0000
@@ -122,6 +122,9 @@
122connection slave;122connection slave;
123let $sync_result = `SELECT MASTER_POS_WAIT('$binlog_file',$binlog_position)`;123let $sync_result = `SELECT MASTER_POS_WAIT('$binlog_file',$binlog_position)`;
124124
125connection master;
126FLUSH LOGS;
127
125-- echo # Analyse master slow_query_log128-- echo # Analyse master slow_query_log
126let $i=7;129let $i=7;
127let $k=1;130let $k=1;
@@ -134,6 +137,9 @@
134 inc $k;137 inc $k;
135}138}
136139
140connection slave;
141FLUSH LOGS;
142
137-- echo # Analyse slave slow_query_log143-- echo # Analyse slave slow_query_log
138let $i=7;144let $i=7;
139let $k=1;145let $k=1;
140146
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.result 2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.result 2010-12-29 19:11:55 +0000
@@ -20,6 +20,7 @@
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;
23FLUSH LOGS;
233243
24show global variables like 'use_global_log_slow_control';25show global variables like 'use_global_log_slow_control';
25Variable_name Value26Variable_name Value
2627
=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.test 2010-12-24 16:44:23 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.test 2010-12-29 19:11:55 +0000
@@ -14,6 +14,7 @@
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
17FLUSH LOGS;
17--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-use_global_long_query_time.log18--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-use_global_long_query_time.log
18--let grep_pattern = Query_time19--let grep_pattern = Query_time
19--source include/grep.inc20--source include/grep.inc

Subscribers

People subscribed via source and target branches

to all changes: