Daniel Black 265e3253f1 MDEV-12055: Correct binlog_stm_ctype_ucs test ... The fix from MDEV-10866 was insufficient. Attempt 2 at fixing this. binlog.binlog_row_ctype_ucs 'row' w18 [ fail ] Test ended at 2017-02-13 10:36:57 CURRENT_TEST: binlog.binlog_row_ctype_ucs --- /mariadb/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result 2017-02-06 09:29:43.116183650 +1100 +++ /mariadb/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.reject 2017-02-13 10:36:56.984056229 +1100 @@ -71,21 +71,21 @@ /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; DELIMITER /*!*/; # at # -#700101 6:46:40 server id # end_log_pos # CRC32 XXX Start: binlog v 4, server v #.##.## created 700101 6:46:40 +#170213 10:36:56 server id # end_log_pos # CRC32 XXX Start: binlog v 4, server v #.##.## created 170213 10:36:56 # at # -#700101 6:46:40 server id # end_log_pos # CRC32 XXX Gtid list [#-#-#] +#170213 10:36:56 server id # end_log_pos # CRC32 XXX Gtid list [#-#-#] # at # -#700101 6:46:40 server id # end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000002 +#170213 10:36:56 server id # end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000002 # at # -#700101 6:46:40 server id # end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000003 +#170213 10:36:56 server id # end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000003 # at # -#700101 6:46:40 server id # end_log_pos # CRC32 XXX GTID #-#-# ddl +#170213 10:36:56 server id # end_log_pos # CRC32 XXX GTID #-#-# ddl /*!100101 SET @@session.skip_parallel_replication=0*//*!*/; /*!100001 SET @@session.gtid_domain_id=#*//*!*/; /*!100001 SET @@session.server_id=#*//*!*/; /*!100001 SET @@session.gtid_seq_no=#*//*!*/; # at # -#700101 6:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 +#170213 10:36:56 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 use `test`/*!*/; SET TIMESTAMP=XXX/*!*/; SET @@session.pseudo_thread_id=#/*!*/; Signed-off-by: Daniel Black <daniel.black@au.ibm.com>		2017-02-13 12:14:25 +11:00
..
r	MDEV-12055: Correct binlog_stm_ctype_ucs test	2017-02-13 12:14:25 +11:00
std_data	MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work	2013-12-09 12:37:45 +01:00
t	Merge branch 'bb-10.2-serg-merge' into 10.2	2017-02-11 09:45:34 +01:00
combinations
disabled.def	mysql-5.5.31 merge	2013-05-07 13:05:09 +02:00