Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb

into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20809

mysql-test/r/ndb_binlog_ddl_multi.result

@@ -27,13 +27,13 @@ master-bin1.000001	#	Query	#	#	use `test`; alter table t2 add column (b int)
 reset master;
 reset master;
 ALTER DATABASE mysqltest CHARACTER SET latin1;
+drop table mysqltest.t1;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	ALTER DATABASE mysqltest CHARACTER SET latin1
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	ALTER DATABASE mysqltest CHARACTER SET latin1
-drop table mysqltest.t1;
 reset master;
 reset master;
 use test;

mysql-test/r/rpl_ndb_dd_advance.result

@@ -49,10 +49,11 @@ c1	c2	c3
 4	8	7
 5	10	8
 FILE_NAME	FILE_TYPE	TABLESPACE_NAME	LOGFILE_GROUP_NAME
+NULL	UNDO LOG	NULL	lg1
 datafile.dat	DATAFILE	ts1	lg1
 datafile02.dat	DATAFILE	ts1	lg1
-undofile.dat	UNDO LOG	ts1	lg1
-undofile02.dat	UNDO LOG	ts1	lg1
+undofile.dat	UNDO LOG	NULL	lg1
+undofile02.dat	UNDO LOG	NULL	lg1
 **** Do First Set of ALTERs in the master table ****
 CREATE INDEX t1_i ON t1(c2, c3);
 ALTER TABLE t1 ADD c4 TIMESTAMP;

mysql-test/t/ndb_binlog_ddl_multi.test

@@ -60,8 +60,8 @@ ALTER DATABASE mysqltest CHARACTER SET latin1;
 
 # having drop here instead of below sometimes triggers bug#18976
 ## drop table and drop should come after data events
-#--connection server2
-#drop table mysqltest.t1;
+--connection server2
+drop table mysqltest.t1;
 
 --connection server1
 --source include/show_binlog_events.inc
@@ -69,8 +69,8 @@ ALTER DATABASE mysqltest CHARACTER SET latin1;
 --real_sleep 10
 --source include/show_binlog_events.inc
 
---connection server2
-drop table mysqltest.t1;
+#--connection server2
+#drop table mysqltest.t1;
 
 # drop database and drop should come after data events
 --connection server1