Upmerge 5.0 -> 5.1 of fix for

CREATE DATABASE mysqltest1;

CREATE DATABASE mysqltest2;

eval CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE=$engine_type;

# Prevent Bug#26687 rpl_ddl test fails if run with --innodb option

# The testscript (suite/rpl/rpl_ddl.test) + the expected result need that the

# slave uses MyISAM for the table mysqltest.t1.

# This is not valid in case of suite/rpl_ndb/rpl_ndb_ddl.test which sources

# also this script.

sync_slave_with_master;

connection slave;

if (`SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES

     WHERE TABLE_SCHEMA = 'mysqltest1' AND TABLE_NAME = 't1'

           AND ENGINE <> 'MyISAM' AND '$engine_type' <> 'NDB'`)

{

   skip This test needs on slave side: InnoDB disabled, default engine: MyISAM;

}

connection master;

INSERT INTO mysqltest1.t1 SET f1= 0;

eval CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE=$engine_type;

eval CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE=$engine_type;