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

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

  1. 5.1.57-fix_bug_785564
  2. Merge into 5.1.57
Proposed by Oleg Tsarev
Status: Merged
Approved by: Valentine Gostev
Approved revision: no longer in the source branch.
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 Approve
Percona developers 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.
Revision history for this message
Valentine Gostev (longbow) wrote :

Oleg, please perform W/A from this MP: https://code.launchpad.net/~percona-dev/percona-server/5.1.57-fix_bug_784378/+merge/62461

review: Needs Fixing (qa)
Revision history for this message
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
=== modified file 'mysql-test/response-time-distribution.patch/percona_query_response_time-replication.result'
--- mysql-test/response-time-distribution.patch/percona_query_response_time-replication.result 2010-12-06 03:08:42 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time-replication.result 2011-05-26 11:21:42 +0000
@@ -1,9 +1,5 @@
1stop slave;1include/master-slave.inc
2drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;2[connection master]
3reset master;
4reset slave;
5drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
6start slave;
7SET SESSION debug="+d,response_time_distribution_log_only_more_300_milliseconds";3SET SESSION debug="+d,response_time_distribution_log_only_more_300_milliseconds";
8DROP TABLE IF EXISTS t;4DROP TABLE IF EXISTS t;
9CREATE TABLE t(id INT);5CREATE TABLE t(id INT);
@@ -68,3 +64,4 @@
68SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;64SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;
69SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=OFF;65SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=OFF;
70SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";66SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";
67include/rpl_end.inc
7168
=== modified file 'mysql-test/response-time-distribution.patch/percona_query_response_time-replication.test'
--- mysql-test/response-time-distribution.patch/percona_query_response_time-replication.test 2010-12-14 20:03:02 +0000
+++ mysql-test/response-time-distribution.patch/percona_query_response_time-replication.test 2011-05-26 11:21:42 +0000
@@ -55,3 +55,5 @@
55SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;55SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10;
56SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=OFF;56SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=OFF;
57SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";57SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds";
58
59--source include/rpl_end.inc

Subscribers

People subscribed via source and target branches