adjust test to give predictable output

mysql-test/r/ndb_binlog_ddl_multi.result

@@ -20,9 +20,6 @@ master-bin.000001	#	Query	#	#	use `mysqltest`; create table t1 (a int primary ke
 master-bin.000001	#	Query	#	#	use `test`; create table t2 (a int primary key) engine=ndb
 reset master;
 reset master;
-use mysqltest;
-drop table test.t2;
-create table t2 (a int primary key) engine=ndb;
 alter table t2 add column (b int);
 show binlog events from 102;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -30,18 +27,12 @@ master-bin1.000001	#	Query	#	#	BEGIN
 master-bin1.000001	#	Table_map	#	#	cluster_replication.apply_status
 master-bin1.000001	#	Write_rows	#	#	
 master-bin1.000001	#	Query	#	#	COMMIT
-master-bin1.000001	#	Query	#	#	use `mysqltest`; drop table test.t2
-master-bin1.000001	#	Query	#	#	use `mysqltest`; create table t2 (a int primary key) engine=ndb
-master-bin1.000001	#	Query	#	#	BEGIN
-master-bin1.000001	#	Table_map	#	#	cluster_replication.apply_status
-master-bin1.000001	#	Write_rows	#	#	
-master-bin1.000001	#	Query	#	#	COMMIT
-master-bin1.000001	#	Query	#	#	use `mysqltest`; alter table t2 add column (b int)
+master-bin1.000001	#	Query	#	#	use `test`; alter table t2 add column (b int)
 reset master;
 reset master;
 ALTER DATABASE mysqltest CHARACTER SET latin1;
-insert into t1 values (1);
-drop table t1;
+insert into mysqltest.t1 values (1);
+drop table mysqltest.t1;
 show binlog events from 102;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	ALTER DATABASE mysqltest CHARACTER SET latin1
@@ -58,25 +49,21 @@ master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `mysqltest`; drop table `t1`
 reset master;
 reset master;
+use test;
 insert into t2 values (1,2);
 drop database mysqltest;
-use test;
 create table t1 (a int primary key) engine=ndb;
-use test;
 show binlog events from 102;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin1.000001	#	Query	#	#	BEGIN
 master-bin1.000001	#	Table_map	#	#	cluster_replication.apply_status
 master-bin1.000001	#	Write_rows	#	#	
-master-bin1.000001	#	Table_map	#	#	mysqltest.t2
-master-bin1.000001	#	Write_rows	#	#	
-master-bin1.000001	#	Query	#	#	COMMIT
-master-bin1.000001	#	Query	#	#	BEGIN
-master-bin1.000001	#	Table_map	#	#	cluster_replication.apply_status
+master-bin1.000001	#	Table_map	#	#	test.t2
 master-bin1.000001	#	Write_rows	#	#	
 master-bin1.000001	#	Query	#	#	COMMIT
 master-bin1.000001	#	Query	#	#	drop database mysqltest
 master-bin1.000001	#	Query	#	#	use `test`; create table t1 (a int primary key) engine=ndb
+drop table t2;
 reset master;
 reset master;
 CREATE LOGFILE GROUP lg1

mysql-test/t/ndb_binlog_ddl_multi.test

@@ -48,10 +48,6 @@ reset master;
 reset master;
 
 --connection server2
-use mysqltest;
-#alter table test.t2 rename t2;
-drop table test.t2;
-create table t2 (a int primary key) engine=ndb;
 alter table t2 add column (b int);
 
 --connections server1
@@ -71,8 +67,8 @@ ALTER DATABASE mysqltest CHARACTER SET latin1;
 
 # drop table and drop should come after data events
 --connection server2
-insert into t1 values (1);
-drop table t1;
+insert into mysqltest.t1 values (1);
+drop table mysqltest.t1;
 
 --connection server1
 --replace_column 2 # 4 # 5 # 
@@ -86,16 +82,18 @@ reset master;
 reset master;
 
 --connection server1
+use test;
 insert into t2 values (1,2);
 drop database mysqltest;
-use test;
 create table t1 (a int primary key) engine=ndb;
 
 --connection server2
-use test;
 --replace_column 2 # 4 # 5 # 
 --eval show binlog events from $binlog_start
 
+--connection server2
+drop table t2;
+
 # logfile groups and table spaces
 --connection server1
 reset master;