diff options
author | Magne Mahre <magne.mahre@sun.com> | 2010-08-17 10:56:50 +0200 |
---|---|---|
committer | Magne Mahre <magne.mahre@sun.com> | 2010-08-17 10:56:50 +0200 |
commit | 968902ddc96e1fd81a35780609e33dba72d437c0 (patch) | |
tree | 8b95b62a6424e3a9d946a10181b5de7d5b172671 | |
parent | a3b9557b3aee40df2671ca6d828d6f7abde4b467 (diff) | |
download | mariadb-git-968902ddc96e1fd81a35780609e33dba72d437c0.tar.gz |
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.
-rw-r--r-- | mysql-test/suite/rpl_ndb/t/disabled.def | 2 | ||||
-rw-r--r-- | mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt | 2 | ||||
-rw-r--r-- | mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-slave.opt | 1 |
3 files changed, 2 insertions, 3 deletions
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 |