diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test index 43ad901d746..3b075808481 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test @@ -12,6 +12,14 @@ -- connection slave -- source include/have_innodb.inc + +# Remove any old ndb_apply_status from slaves datadir +let $datadir= `SELECT @@datadir`; +--error 0,1 +remove_file $datadir/mysql/ndb_apply_status.frm; +--error 0,1 +remove_file $datadir/mysql/ndb_apply_status.ndb; + set @@global.slave_exec_mode= 'IDEMPOTENT'; CREATE TABLE mysql.ndb_apply_status ( server_id INT UNSIGNED NOT NULL, diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test index b19116ffd78..560efec255b 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test @@ -11,6 +11,14 @@ -- source include/master-slave.inc -- connection slave + +# Remove any old ndb_apply_status from slaves datadir +let $datadir= `SELECT @@datadir`; +--error 0,1 +remove_file $datadir/mysql/ndb_apply_status.frm; +--error 0,1 +remove_file $datadir/mysql/ndb_apply_status.ndb; + set @@global.slave_exec_mode= 'IDEMPOTENT'; CREATE TABLE mysql.ndb_apply_status ( server_id INT UNSIGNED NOT NULL, diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test index 67e8f7cea42..99eb5d50364 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test @@ -17,6 +17,14 @@ SET storage_engine=ndb; --echo === NDB -> MYISAM === --echo connection slave; + +# Remove any old ndb_apply_status from slaves datadir +let $datadir= `SELECT @@datadir`; +--error 0,1 +remove_file $datadir/mysql/ndb_apply_status.frm; +--error 0,1 +remove_file $datadir/mysql/ndb_apply_status.ndb; + set @@global.slave_exec_mode= 'IDEMPOTENT'; CREATE TABLE mysql.ndb_apply_status ( server_id INT UNSIGNED NOT NULL,