Commit 4ddeb426 authored by He Zhenxing's avatar He Zhenxing

auto merge

parents 113deaec 7e290ccc
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
# BUG#26395: if crash during autocommit update to transactional table on master, slave fails # 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/have_ndb.inc;
source include/ndb_master-slave.inc;
source include/have_innodb.inc; source include/have_innodb.inc;
CREATE TABLE tmyisam (a int) ENGINE = MYISAM; CREATE TABLE tmyisam (a int) ENGINE = MYISAM;
......
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