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

Merge lp:~percona-dev/percona-server/release-5.1.52-12-fix-bug-676146 into lp:~percona-dev/percona-server/release-5.1.52-12

  1. release-5.1.52-12-fix-bug-676146
  2. Merge into release-5.1.52-12
Proposed by Oleg Tsarev
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 146
Proposed branch: lp:~percona-dev/percona-server/release-5.1.52-12-fix-bug-676146
Merge into: lp:~percona-dev/percona-server/release-5.1.52-12
Diff against target: 17 lines (+3/-2)
1 file modified
mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test (+3/-2)
To merge this branch: bzr merge lp:~percona-dev/percona-server/release-5.1.52-12-fix-bug-676146
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+41165@code.launchpad.net

Description of the change

fix bug 676146
> > Test doesn't work on row-based replication. Now test check replication type

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

OK to merge.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'mysql-test/percona_slave_innodb_stats-master.opt' => 'mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats-master.opt'
2=== renamed file 'mysql-test/percona_slave_innodb_stats-slave.opt' => 'mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats-slave.opt'
3=== renamed file 'mysql-test/percona_slave_innodb_stats.result' => 'mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result'
4=== renamed file 'mysql-test/percona_slave_innodb_stats.test' => 'mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test'
5--- mysql-test/percona_slave_innodb_stats.test 2010-07-01 20:32:19 +0000
6+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test 2010-11-18 12:41:53 +0000
7@@ -1,5 +1,6 @@
8-source include/have_innodb.inc;
9-source include/master-slave.inc;
10+-- source include/have_binlog_format_mixed_or_statement.inc
11+-- source include/have_innodb.inc
12+-- source include/master-slave.inc
13
14 connection master;
15 -- disable_warnings
16
17=== renamed directory 'mysql-test/show_slave_status_nolock.patch' => 'mysql-test/slow_extended.patch/show_slave_status_nolock.patch'

Subscribers

People subscribed via source and target branches

to all changes: