Commit 87acac5f authored by unknown's avatar unknown
Browse files

After merge fix

parent 99a4775c

mysql-test/extra/binlog_tests/blackhole.test

+1 −0
Original line number Diff line number Diff line
@@ -146,5 +146,6 @@ set autocommit=1; 
--replace_column 2 # 5 #

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

show binlog events;

drop table if exists t1;



# End of 5.0 tests

mysql-test/r/binlog_row_blackhole.result

+0 −5
Original line number Diff line number Diff line
@@ -141,8 +141,3 @@ master-bin.000001 # Table_map 1 # table_id: # (test.t1) 
master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	use `test`; COMMIT

drop table if exists t1;
 
create table t1 (c char(20)) engine=MyISAM;

insert into t1 values ("Monty"),("WAX"),("Walrus");

alter table t1 engine=blackhole;

ERROR HY000: Table storage engine for 't1' doesn't have this option

drop table t1;

mysql-test/r/binlog_stm_blackhole.result

+0 −5
Original line number Diff line number Diff line
@@ -141,8 +141,3 @@ master-bin.000001 # Query 1 # use `test`; BEGIN 
master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(1)

master-bin.000001	#	Query	1	#	use `test`; COMMIT

drop table if exists t1;
 
create table t1 (c char(20)) engine=MyISAM;

insert into t1 values ("Monty"),("WAX"),("Walrus");

alter table t1 engine=blackhole;

ERROR HY000: Table storage engine for 't1' doesn't have this option

drop table t1;