Commit 54715b8b authored by unknown's avatar unknown
Browse files

Test fixes 


mysql-test/r/binlog_row_drop_tmp_tbl.result:
  Updated result file
mysql-test/r/rpl_row_charset.result:
  Updated result file
mysql-test/r/rpl_switch_stm_row_mixed.result:
  Updated result file
mysql-test/t/disabled.def:
  Disabled test case
parent ddb27fa5

mysql-test/r/binlog_row_drop_tmp_tbl.result

+2 −0
Original line number Diff line number Diff line
@@ -14,5 +14,7 @@ get_lock("a",10) 
show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.proc)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	create database `drop-temp+table-test`

drop database `drop-temp+table-test`;

mysql-test/r/rpl_row_charset.result

+0 −10
Original line number Diff line number Diff line
@@ -114,20 +114,14 @@ Log_name Pos Event_type Server_id End_log_pos Info 
master-bin.000001	#	Query	1	#	drop database if exists mysqltest2

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.proc)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.event)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	drop database if exists mysqltest3

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.proc)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.event)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	create database mysqltest2 character set latin2

master-bin.000001	#	Query	1	#	create database mysqltest3

master-bin.000001	#	Query	1	#	drop database mysqltest3

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.proc)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.event)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	create database mysqltest3

master-bin.000001	#	Query	1	#	use `mysqltest2`; create table t1 (a int auto_increment primary key, b varchar(100))

master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest2.t1)
@@ -155,13 +149,9 @@ master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F 
master-bin.000001	#	Query	1	#	drop database mysqltest2

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.proc)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.event)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	drop database mysqltest3

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.proc)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	1	#	table_id: # (mysql.event)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

select "--- --global--" as "";



--- --global--

mysql-test/r/rpl_switch_stm_row_mixed.result

+3 −3
Original line number Diff line number Diff line
@@ -190,13 +190,13 @@ master-bin.000001 # User var 1 # @`string`=_latin1 0x656D657267656E6379 COLLATE 
master-bin.000001	#	Query	1	#	use `mysqltest1`; insert into t1 select @'string'

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	use `mysqltest1`; insert into t1 select "yesterday"

master-bin.000001	#	Query	1	#	use `mysqltest1`; create procedure foo()

master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` procedure foo()

begin

insert into t1 values("work");

insert into t1 values(concat("for",UUID()));

insert into t1 select "yesterday";

end

master-bin.000001	#	Query	1	#	use `mysqltest1`; create procedure foo2()

master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` procedure foo2()

begin

insert into t1 values(concat("emergency",UUID()));

insert into t1 values("work");
@@ -205,7 +205,7 @@ set session binlog_format=row; # accepted for stored procs 
insert into t1 values("more work");

set session binlog_format=mixed;

end

master-bin.000001	#	Query	1	#	use `mysqltest1`; create function foo3() returns bigint unsigned

master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` function foo3() returns bigint unsigned

begin

set session binlog_format=row; # rejected for stored funcs

insert into t1 values("alarm");

mysql-test/t/disabled.def

+1 −0
Original line number Diff line number Diff line
@@ -43,3 +43,4 @@ rpl_sp : Bug#16456 
rpl_until               : Unstable test case, bug#15886

sp-goto                 : GOTO is currently is disabled - will be fixed in the future

rpl_rbr_to_sbr          : BUG#18108

mysqldump               : BUG#18078