From 968902ddc96e1fd81a35780609e33dba72d437c0 Mon Sep 17 00:00:00 2001 From: Magne Mahre Date: Tue, 17 Aug 2010 10:56:50 +0200 Subject: [PATCH] Bug #54850 rpl_ndb.rpl_ndb_stm_innodb and rpl_ndb.rpl_ndb_2other fails The two regressions tests failed after WL#5349 was pushed, since they were writted with the implicit requirement that MyISAM is the default storage engine. Adding --default-storage-engine=MyISAM as startup parameter, to mimic the pre-wl#5349 situation. mysql-test/suite/rpl_ndb/t/disabled.def: Re-enabling rpl_ndb_stm_innodb and rpl_ndb_2other mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt: Setting MyISAM as default storage engine explicitly mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-slave.opt: The slave also needs to be started with MyISAM as default engine. --- mysql-test/suite/rpl_ndb/t/disabled.def | 2 -- mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt | 2 +- mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-slave.opt | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-slave.opt diff --git a/mysql-test/suite/rpl_ndb/t/disabled.def b/mysql-test/suite/rpl_ndb/t/disabled.def index 8eda2f18958..3dca5048213 100644 --- a/mysql-test/suite/rpl_ndb/t/disabled.def +++ b/mysql-test/suite/rpl_ndb/t/disabled.def @@ -10,8 +10,6 @@ # ############################################################################## -rpl_ndb_stm_innodb : Bug#54850 2010-07-02 alik rpl_ndb.rpl_ndb_stm_innodb and rpl_ndb.rpl_ndb_2other fails -rpl_ndb_2other : Bug#54850 2010-07-02 alik rpl_ndb.rpl_ndb_stm_innodb and rpl_ndb.rpl_ndb_2other fails rpl_ndb_row_implicit_commit_binlog : Bug#55849 2010-08-09 alik rpl_ndb.rpl_ndb_row_implicit_commit_binlog fails # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt index dff423702b4..378a377e053 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt @@ -1 +1 @@ ---innodb --loose-ndbcluster=OFF --log-slave-updates=0 +--innodb --loose-ndbcluster=OFF --log-slave-updates=0 --default-storage-engine=MyISAM diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-slave.opt new file mode 100644 index 00000000000..96f0ce3f36c --- /dev/null +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-slave.opt @@ -0,0 +1 @@ +--default-storage-engine=MyISAM