Commit 375473ed authored by jmiller@mysql.com's avatar jmiller@mysql.com

rpl_row_basic_11bugs.test, rpl_multi_engine.test, rpl_flsh_tbls.test:

  Updated per lars
rpl_row_flsh_tbls.test:
  updated per lars
parent 11d442a1
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
# Test of FLUSH NO_WRITE_TO_BINLOG by the way. # Test of FLUSH NO_WRITE_TO_BINLOG by the way.
# #
# Merge will not work with a default ndb engine
-- source include/not_ndb_default.inc
-- source include/master-slave.inc -- source include/master-slave.inc
......
# See if replication between MyISAM, MEMORY and InnoDB works. # See if replication between MyISAM, MEMORY and InnoDB works.
# Results files do not match when ndb is default #This test case is not written for NDB, result files do not
#match when NDB is the default engine
-- source include/not_ndb_default.inc -- source include/not_ndb_default.inc
-- source include/master-slave.inc -- source include/master-slave.inc
......
--source include/have_row_based.inc --source include/have_row_based.inc
--source include/have_binlog_format_row.inc --source include/have_binlog_format_row.inc
# Show binlog events will cause failure when ndb is default
#This test case is not written for NDB, the result files
#will not match when NDB is the default engine
-- source include/not_ndb_default.inc -- source include/not_ndb_default.inc
--source include/master-slave.inc --source include/master-slave.inc
......
...@@ -6,6 +6,11 @@ let $rename_event_pos= 615; ...@@ -6,6 +6,11 @@ let $rename_event_pos= 615;
# Bug#18326: Do not lock table for writing during prepare of statement # Bug#18326: Do not lock table for writing during prepare of statement
# The use of the ps protocol causes extra table maps in the binlog, so # The use of the ps protocol causes extra table maps in the binlog, so
# we disable the ps-protocol for this statement. # we disable the ps-protocol for this statement.
# Merge tables are not supported in NDB
-- source include/not_ndb_default.inc
--disable_ps_protocol --disable_ps_protocol
-- source extra/rpl_tests/rpl_flsh_tbls.test -- source extra/rpl_tests/rpl_flsh_tbls.test
--enable_ps_protocol --enable_ps_protocol
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment