Merge lp:~percona-dev/percona-server/5.5.11-fix-bug-758934 into lp:~percona-dev/percona-server/5.5.11

Proposed by Oleg Tsarev
Status: Merged
Merge reported by: Alexey Kopytov
Merged at revision: not available
Proposed branch: lp:~percona-dev/percona-server/5.5.11-fix-bug-758934
Merge into: lp:~percona-dev/percona-server/5.5.11
Diff against target: 18 lines (+11/-0)
1 file modified
mysql-test.diff (+11/-0)
To merge this branch: bzr merge lp:~percona-dev/percona-server/5.5.11-fix-bug-758934
Reviewer Review Type Date Requested Status
Valentine Gostev Pending
Percona developers Pending
Review via email: mp+58516@code.launchpad.net

Description of the change

"fix bug #758934 - http://lists.mysql.com/commits/133904 Just add fix, I didn't reproduce this bug (sporadic)

To post a comment you must log in.
110. By Oleg Tsarev

fix header

111. By Oleg Tsarev

fix bug #758934 - http://lists.mysql.com/commits/133904 Just add fix, I didn't reproduce this bug (sporadic)--fixes=lp:758934

112. By Oleg Tsarev

just fix not needed changes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysql-test.diff'
2--- mysql-test.diff 2011-04-09 15:20:23 +0000
3+++ mysql-test.diff 2011-04-20 15:41:32 +0000
4@@ -1342,3 +1342,14 @@
5 +++ b/mysql-test/suite/sys_vars/t/userstat_basic.test 2011-04-09 18:49:05.000000000 +0400
6 @@ -0,0 +1 @@
7 +SELECT @@global.userstat;
8+diff -ruN a/mysql-test/suite/rpl/t/rpl_semi_sync_event.test b/mysql-test/suite/rpl/t/rpl_semi_sync_event.test
9+--- a/mysql-test/suite/rpl/t/rpl_semi_sync_event.test 2011-03-31 16:36:17.000000000 +0300
10++++ b/mysql-test/suite/rpl/t/rpl_semi_sync_event.test 2011-04-20 18:01:51.000000000 +0300
11+@@ -15,6 +15,7 @@
12+ connection slave;
13+ call mtr.add_suppression("Master server does not support semi-sync");
14+ call mtr.add_suppression("Semi-sync slave .* reply");
15++call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group");
16+ enable_query_log;
17+
18+ connection master;

Subscribers

People subscribed via source and target branches