database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
This commit is contained in:
mskold/marty@linux.site
2006-09-20 16:49:06 +02:00
parent 6a98b6c39e 99a4f96535
commit d6d0208dfb
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/r/ndb_binlog_ddl_multi.result
View File

@@ -27,13 +27,13 @@ master-bin1.000001 # Query # # use `test`; alter table t2 add column (b int)
reset master; reset master;
reset master; reset master;
ALTER DATABASE mysqltest CHARACTER SET latin1; 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
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; 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
reset master; reset master;
reset master; reset master;
use test; use test;

8
mysql-test/t/ndb_binlog_ddl_multi.test
View File

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