From 7e290cccdb8ffa2dbf005665bb095979ef40e743 Mon Sep 17 00:00:00 2001 From: Andrei Elkin Date: Thu, 14 Aug 2008 00:18:31 +0300 Subject: [PATCH] Bug #38738 rpl_ndb_mixed_engines_transactions result content mismatch pb notices differences in results at the very beginning of the test. Absense of mysql.ndb_apply_status must be benign anyway, but the warning should not happen if have_ndb.inc is invoked ahead of ndb_master-slave. Fixed with relocation of the macros. mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test: positioning have_ndb prior ndb_master-slave --- .../suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test index 2aee4a827c3..14b76722fa6 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test @@ -22,8 +22,8 @@ # BUG#26395: if crash during autocommit update to transactional table on master, slave fails -source include/ndb_master-slave.inc; source include/have_ndb.inc; +source include/ndb_master-slave.inc; source include/have_innodb.inc; CREATE TABLE tmyisam (a int) ENGINE = MYISAM;