Commit d9b833a7 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
parents 54d5a79e a4a8cc99

mysql-test/r/ndb_binlog_ddl_multi.result

+1 −1
Original line number Diff line number Diff line
@@ -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/t/ndb_binlog_ddl_multi.test

+4 −4
Original line number Diff line number Diff line
@@ -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