Commit 55c10a09 authored by unknown's avatar unknown
Browse files

After merge fix

parent 75127a69

mysql-test/r/binlog_stm_ctype_ucs.result

+11 −9
Original line number Diff line number Diff line
@@ -9,15 +9,17 @@ master-bin.000001 102 User var 1 142 @`v`=_ucs2 0x006100620063 COLLATE ucs2_gene 
master-bin.000001	142	Query	1	231	use `test`; insert into t2 values (@v)

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

SET @`v`:=_ucs2 0x006100620063 COLLATE `ucs2_general_ci`;

use test;

SET TIMESTAMP=10000;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;

SET @@session.sql_mode=0;

/*!\C latin1 */;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t2 values (@v);

DELIMITER /*!*/;

ROLLBACK/*!*/;

SET @`v`:=_ucs2 0x006100620063 COLLATE `ucs2_general_ci`/*!*/;

use test/*!*/;

SET TIMESTAMP=10000/*!*/;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;

SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

insert into t2 values (@v)/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;

mysql-test/r/rpl_timezone.result

+0 −32
Original line number Diff line number Diff line
@@ -39,38 +39,6 @@ SELECT * FROM t1 ORDER BY n; 
t	n

2004-01-01 00:00:00	5

2004-06-11 09:39:02	6

select * from t1;

t

2004-01-01 00:00:00

2004-06-11 09:39:02

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

DELIMITER /*!*/;

ROLLBACK/*!*/;

use test/*!*/;

SET TIMESTAMP=100000000/*!*/;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;

SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

create table t1 (t timestamp)/*!*/;

SET TIMESTAMP=100000000/*!*/;

create table t2 (t char(32))/*!*/;

SET TIMESTAMP=100000000/*!*/;

SET @@session.time_zone='Europe/Moscow'/*!*/;

insert into t1 values ('20050101000000'), ('20050611093902')/*!*/;

SET TIMESTAMP=100000000/*!*/;

SET @@session.time_zone='UTC'/*!*/;

insert into t1 values ('20040101000000'), ('20040611093902')/*!*/;

SET TIMESTAMP=100000000/*!*/;

delete from t1/*!*/;

SET TIMESTAMP=100000000/*!*/;

SET @@session.time_zone='Europe/Moscow'/*!*/;

insert into t1 values ('20040101000000'), ('20040611093902')/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;

delete from t1;

set time_zone='UTC';

load data infile '../std_data_ln/rpl_timezone2.dat' into table t1;

mysql-test/t/binlog_stm_mix_innodb_myisam.test

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ eval select 
is not null;

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

eval select

@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%",

@a like "%#%error_code=0%ROLLBACK/*!*/;%ROLLBACK /* added by mysqlbinlog */;%",

@a not like "%#%error_code=%error_code=%";

drop table t1, t2;