Post-merge fixes to make tests pass.

mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result:
  Result change
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
  Removing duplicate DROP TABLE causing test to fail.

mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result

@@ -105,10 +105,6 @@ Last_IO_Error
 
 SELECT * FROM tinnodb ORDER BY a;
 a
-DROP TABLE tmyisam;
-DROP TABLE tinnodb;
-DROP TABLE tndb;
 --- on master ---
-DROP TABLE tmyisam;
-DROP TABLE tinnodb;
-DROP TABLE tndb;
+DROP TABLE tmyisam, tinnodb, tndb;
+DROP TABLE tmyisam, tinnodb, tndb;

mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test

@@ -122,12 +122,8 @@ SELECT * FROM tinnodb ORDER BY a;
 # Clean up. We cannot do it on master and replicate over, because
 # master binlog is in a bad state after last test. So we do it both on
 # master and on slave.
-DROP TABLE tmyisam;
-DROP TABLE tinnodb;
-DROP TABLE tndb;
 --echo --- on master ---
 connection master;
-connection master;
 DROP TABLE tmyisam, tinnodb, tndb;
 
 connection slave;