Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

mysql-test/r/ndb_binlog_ddl_multi.result

@@ -32,6 +32,10 @@ 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
 master-bin.000001	#	Query	#	#	use `mysqltest`; drop table `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
+master-bin.000001	#	Query	#	#	use `mysqltest`; drop table `t1`
 reset master;
 reset master;
 use test;
@@ -111,6 +115,37 @@ ENGINE = NDB
 master-bin1.000001	#	Query	#	#	DROP LOGFILE GROUP lg1 
 ENGINE =NDB
 master-bin1.000001	#	Query	#	#	use `test`; drop table `t1`
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin1.000001	#	Query	#	#	CREATE LOGFILE GROUP lg1
+ADD UNDOFILE 'undofile.dat'
+INITIAL_SIZE 16M
+UNDO_BUFFER_SIZE = 1M
+ENGINE=NDB
+master-bin1.000001	#	Query	#	#	ALTER LOGFILE GROUP lg1
+ADD UNDOFILE 'undofile02.dat'
+INITIAL_SIZE = 4M 
+ENGINE=NDB
+master-bin1.000001	#	Query	#	#	CREATE TABLESPACE ts1
+ADD DATAFILE 'datafile.dat'
+USE LOGFILE GROUP lg1
+INITIAL_SIZE 12M
+ENGINE NDB
+master-bin1.000001	#	Query	#	#	ALTER TABLESPACE ts1
+ADD DATAFILE 'datafile02.dat'
+INITIAL_SIZE = 4M 
+ENGINE=NDB
+master-bin1.000001	#	Query	#	#	ALTER TABLESPACE ts1 
+DROP DATAFILE 'datafile.dat' 
+ENGINE = NDB
+master-bin1.000001	#	Query	#	#	ALTER TABLESPACE ts1 
+DROP DATAFILE 'datafile02.dat' 
+ENGINE = NDB
+master-bin1.000001	#	Query	#	#	DROP TABLESPACE ts1 
+ENGINE = NDB
+master-bin1.000001	#	Query	#	#	DROP LOGFILE GROUP lg1 
+ENGINE =NDB
+master-bin1.000001	#	Query	#	#	use `test`; drop table `t1`
 reset master;
 show tables;
 Tables_in_test

mysql-test/t/disabled.def

@@ -12,37 +12,28 @@
 events_bugs             : test case unstable (race conditions). andrey will fix
 events_stress           : test case unstable. andrey will fix
 events                  : test case unstable. andrey will fix
-#ndb_alter_table_row    : sometimes wrong error 1015!=1046
 ndb_autodiscover        : Needs to be fixed w.r.t binlog
 ndb_autodiscover2       : Needs to be fixed w.r.t binlog
-#ndb_binlog_basic        : Results are not deterministic, Tomas will fix
-#ndb_binlog_multi        : Results are not deterministic, Tomas will fix
-ndb_cache2  : Bug #18597
-ndb_gis    : Bug #18600
-ndb_load                : Bug#17233
-partition_03ndb         : Bug#16385
+#ndb_cache2              : Bug #18597 simultaneous drop table and ndb statistics update triggers node failure
+#ndb_gis                 : Bug #18600 ndb_gis test failure
+#ndb_load                : Bug#17233 failed load data from infile causes mysqld dbug_assert, binlog not flushed
+#partition_03ndb         : Bug#16385 Partitions: crash when updating a range partitioned NDB table
 ps_7ndb                 : dbug assert in RBR mode when executing test suite
-#rpl_bit_npk             : Bug#13418
-#rpl_ddl                 : Bug#15963 SBR does not show "Definer" correctly
-rpl_ndb_dd_basic        : Bug #18569
-rpl_row_basic_7ndb        : Bug #18923
-rpl_ndb_dd_advance        : Bug #18924
-rpl_ndb_multi_update2     : Bug #18928
-rpl_ndb_2innodb         : assertion in get_parts_for_update()
-rpl_ndb_2myisam         : assertion in get_parts_for_update()
-rpl_ndb_auto_inc        : Bug#17086
-rpl_ndb_basic           : Bug #18592
-#rpl_ndb_blob            : interferes with following tests, causing hang
-#rpl_ndb_blob2           : interferes with following tests, causing hang
-rpl_ndb_ddl             : master hangs
-#rpl_ndb_delete_nowhere  : Bug#17400: delete & update of rows in table without pk fails
-rpl_ndb_insert_ignore : Bug #18567
-rpl_ndb_innodb2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails
-rpl_ndb_myisam2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails
-rpl_ndb_multi_update3   : Bug#18627: Cluster Replication: rpl_ndb_multi_update3 fails on Intel 64 bit
-rpl_ndb_log             : result not deterministic, TBD if should remove
-rpl_ndb_relay_space     : Bug#16993
-#rpl_ndb_multi_update3   : Bug#17400: delete & update of rows in table without pk fails
+#rpl_ndb_2innodb         : assertion in get_parts_for_update()
+#rpl_ndb_2myisam         : assertion in get_parts_for_update()
+rpl_ndb_auto_inc        : Bug#17086 CR: auto_increment_increment and auto_increment_offset produce duplicate key er
+#rpl_ndb_basic           : Bug #18592 rpl_ndb_basic failure
+#rpl_ndb_dd_advance      : Bug #18924 rpl_ndb_dd_advance failure
+#rpl_ndb_dd_basic        : Bug #18569 rpl_ndb_dd_basic failure
+#rpl_ndb_ddl             : master hangs
+#rpl_ndb_insert_ignore   : Bug #18567 rpl_ndb_insert_ignore failure
+#rpl_ndb_innodb2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails
+#rpl_ndb_log             : result not deterministic, TBD if should remove
+#rpl_ndb_multi_update2   : Bug #18928 rpl_ndb_multi_update2 failed
+#rpl_ndb_multi_update3   : Bug#18627: Cluster Replication: rpl_ndb_multi_update3 fails on Intel 64 bit
+#rpl_ndb_myisam2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails
+rpl_ndb_relay_space     : Bug#16993 RBR: ALTER TABLE ZEROFILL AUTO_INCREMENT is not replicated correctly
+#rpl_row_basic_7ndb      : Bug #18923 rpl_row_basic_7ndb failure
 rpl_switch_stm_row_mixed : Bug #18590
 rpl_row_inexist_tbl     : Disabled since patch makes this test wait forever
 rpl_sp                  : Bug#16456

mysql-test/t/ndb_binlog_ddl_multi.test

@@ -64,7 +64,9 @@ drop table mysqltest.t1;
 
 --connection server1
 --source include/show_binlog_events.inc
-
+# to track down bug#18976
+--real_sleep 10
+--source include/show_binlog_events.inc
 
 # drop database and drop should come after data events
 --connection server1
@@ -131,6 +133,9 @@ drop table t1;
 
 --connection server2
 --source include/show_binlog_events.inc
+# to track down bug#18976
+--real_sleep 10
+--source include/show_binlog_events.inc
 
 #
 # Bug #17827 cluster: rename of several tables in one statement,