Merge lp:~percona-dev/percona-server/5.1.57-fix_bug_785564 into lp:~percona-dev/percona-server/5.1.57

Proposed by Oleg Tsarev on 2011-05-26
Status: Merged
Approved by: Valentine Gostev on 2011-05-26
Approved revision: 228
Merged at revision: 230
Proposed branch: lp:~percona-dev/percona-server/5.1.57-fix_bug_785564
Merge into: lp:~percona-dev/percona-server/5.1.57
Diff against target: 30 lines (+5/-6)
2 files modified
mysql-test/response-time-distribution.patch/percona_query_response_time-replication.result (+3/-6)
mysql-test/response-time-distribution.patch/percona_query_response_time-replication.test (+2/-0)
To merge this branch: bzr merge lp:~percona-dev/percona-server/5.1.57-fix_bug_785564
Reviewer Review Type Date Requested Status
Valentine Gostev (community) qa 2011-05-26 Approve on 2011-05-26
Percona developers 2011-05-26 Pending
Review via email: mp+62463@code.launchpad.net

This proposal supersedes a proposal from 2011-05-25.

Description of the change

1) ./mysql-test-run changed output of test percona_query_response_time (mysql 5.1.57 changes)
2) Post-run check was failing because slave didn't stop sometimes.
I added "STOP SLAVE" in the end of the test and test works fine.
This fixes bug #785564

To post a comment you must log in.
Valentine Gostev (longbow) wrote :
review: Needs Fixing (qa)
Valentine Gostev (longbow) wrote :

ignore my msg please, looked into wrong place.

review: Approve (qa)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysql-test/response-time-distribution.patch/percona_query_response_time-replication.result'
2--- mysql-test/response-time-distribution.patch/percona_query_response_time-replication.result 2010-12-06 03:08:42 +0000
3+++ mysql-test/response-time-distribution.patch/percona_query_response_time-replication.result 2011-05-26 11:21:42 +0000
4@@ -1,9 +1,5 @@
5-stop slave;
6-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
7-reset master;
8-reset slave;
9-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
10-start slave;
11+include/master-slave.inc
12+[connection master]
13 SET SESSION debug="+d,response_time_distribution_log_only_more_300_milliseconds";
14 DROP TABLE IF EXISTS t;
15 CREATE TABLE t(id INT);
16@@ -68,3 +64,4 @@
17 SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;
18 SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=OFF;
19 SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";
20+include/rpl_end.inc
21
22=== modified file 'mysql-test/response-time-distribution.patch/percona_query_response_time-replication.test'
23--- mysql-test/response-time-distribution.patch/percona_query_response_time-replication.test 2010-12-14 20:03:02 +0000
24+++ mysql-test/response-time-distribution.patch/percona_query_response_time-replication.test 2011-05-26 11:21:42 +0000
25@@ -55,3 +55,5 @@
26 SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;
27 SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=OFF;
28 SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";
29+
30+--source include/rpl_end.inc

Subscribers

People subscribed via source and target branches