Fix for BUG#11868903 (BUG#59717).
Automerge: mysql-5.1 --> mysql-5.5
This commit is contained in:
commit
37f49e697e
@ -93,6 +93,7 @@ DROP TABLE t1, t2;
|
|||||||
CREATE TABLE t1 (c1 INT KEY, c2 INT) ENGINE=InnoDB;
|
CREATE TABLE t1 (c1 INT KEY, c2 INT) ENGINE=InnoDB;
|
||||||
CREATE TABLE t2 (c1 INT) ENGINE=MyISAM;
|
CREATE TABLE t2 (c1 INT) ENGINE=MyISAM;
|
||||||
INSERT INTO t1 VALUES(1, 1);
|
INSERT INTO t1 VALUES(1, 1);
|
||||||
|
[connection master]
|
||||||
SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid';
|
SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid';
|
||||||
[connection slave]
|
[connection slave]
|
||||||
include/restart_slave.inc
|
include/restart_slave.inc
|
||||||
|
@ -71,11 +71,13 @@ CREATE TABLE t1 (c1 INT KEY, c2 INT) ENGINE=InnoDB;
|
|||||||
CREATE TABLE t2 (c1 INT) ENGINE=MyISAM;
|
CREATE TABLE t2 (c1 INT) ENGINE=MyISAM;
|
||||||
INSERT INTO t1 VALUES(1, 1);
|
INSERT INTO t1 VALUES(1, 1);
|
||||||
|
|
||||||
|
sync_slave_with_master;
|
||||||
|
|
||||||
|
--source include/rpl_connection_master.inc
|
||||||
|
|
||||||
let $debug_save= `SELECT @@GLOBAL.debug`;
|
let $debug_save= `SELECT @@GLOBAL.debug`;
|
||||||
SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid';
|
SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid';
|
||||||
|
|
||||||
sync_slave_with_master;
|
|
||||||
|
|
||||||
--source include/rpl_connection_slave.inc
|
--source include/rpl_connection_slave.inc
|
||||||
source include/restart_slave_sql.inc;
|
source include/restart_slave_sql.inc;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user