Yet more changes to fix the merge clone.

mysql-test/suite/rpl/t/rpl_idempotency.test:
  Adding "have_innodb.inc" since the test reqires InnoDB.

mysql-test/suite/rpl/t/rpl_idempotency.test

@@ -2,6 +2,10 @@
 # work the same way under statement based as under row based.
 
 source include/master-slave.inc;
+connection master;
+source include/have_innodb.inc;
+connection slave;
+source include/have_innodb.inc;
 
 connection master;
 CREATE TABLE t1 (a INT PRIMARY KEY);