Commit 5d85c843 authored by unknown's avatar unknown
Browse files

Test fixes 


mysql-test/include/show_binlog_events.inc:
  Mask table id from binlog output
mysql-test/t/ndb_binlog_ddl_multi.test:
  Use show_binlog_events.inc file
parent 4c4aea2d

mysql-test/include/show_binlog_events.inc

+1 −0
Original line number Diff line number Diff line 
--let $binlog_start=102

--replace_result $binlog_start <binlog_start>

--replace_column 2 # 4 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

--eval show binlog events from $binlog_start

mysql-test/t/ndb_binlog_ddl_multi.test

+6 −23
Original line number Diff line number Diff line
@@ -31,15 +31,10 @@ create table t1 (a int primary key) engine=ndb; 


--connection server2

create table t2 (a int primary key) engine=ndb;

--replace_result $binlog_start <binlog_start>

--replace_column 2 # 4 # 5 # 

--eval show binlog events from $binlog_start

--source include/show_binlog_events.inc



--connection server1

--replace_result $binlog_start <binlog_start>

--replace_column 2 # 4 # 5 # 

--replace_regex /table_id: [0-9]+/table_id: #/

--eval show binlog events from $binlog_start

--source include/show_binlog_events.inc



# alter table

--connection server1
@@ -51,10 +46,7 @@ reset master; 
alter table t2 add column (b int);



--connections server1

--replace_result $binlog_start <binlog_start>

--replace_column 2 # 4 # 5 # 

--replace_regex /table_id: [0-9]+/table_id: #/

--eval show binlog events from $binlog_start

--source include/show_binlog_events.inc



# alter database

--connection server1
@@ -71,10 +63,7 @@ ALTER DATABASE mysqltest CHARACTER SET latin1; 
drop table mysqltest.t1;



--connection server1

--replace_result $binlog_start <binlog_start>

--replace_column 2 # 4 # 5 # 

--replace_regex /table_id: [0-9]+/table_id: #/

--eval show binlog events from $binlog_start

--source include/show_binlog_events.inc





# drop database and drop should come after data events
@@ -90,10 +79,7 @@ drop database mysqltest; 
create table t1 (a int primary key) engine=ndb;



--connection server2

--replace_result $binlog_start <binlog_start>

--replace_column 2 # 4 # 5 # 

--replace_regex /table_id: [0-9]+/table_id: #/

--eval show binlog events from $binlog_start

--source include/show_binlog_events.inc



--connection server2

drop table t2;
@@ -144,10 +130,7 @@ ENGINE =NDB; 
drop table t1;



--connection server2

--replace_result $binlog_start <binlog_start>

--replace_column 2 # 4 # 5 # 

--replace_regex /table_id: [0-9]+/table_id: #/

--eval show binlog events from $binlog_start

--source include/show_binlog_events.inc



#

# Bug #17827 cluster: rename of several tables in one statement,