From 07d38435ea9aee603acafe763c3dc4c39bc72daa Mon Sep 17 00:00:00 2001
From: "mkindahl@dl145h.mysql.com" <>
Date: Sun, 13 Jan 2008 22:13:17 +0100
Subject: [PATCH] Post-merge fixes to make tests pass.

---
 mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result | 8 ++------
 mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test   | 4 ----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result
index 94ba40478e0..bbd0a873dc8 100644
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result
+++ b/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;
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test
index 8e9daa04914..8cca8202bea 100644
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test
+++ b/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;