Commit 476a7bf2 authored by mats@mats-laptop.(none)'s avatar mats@mats-laptop.(none)
Browse files

Post-merge fixes to remove test failures resulting from merge.

parent c14426ae

mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result

+4 −0
Original line number Diff line number Diff line
@@ -16,10 +16,14 @@ DELIMITER /*!*/; 
ROLLBACK/*!*/;

use test/*!*/;

SET TIMESTAMP=10000/*!*/;

SET @@session.pseudo_thread_id=999999999/*!*/;

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

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

SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;

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

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

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

SET @@session.collation_database=DEFAULT/*!*/;

BEGIN

/*!*/;

SET TIMESTAMP=10000/*!*/;

mysql-test/suite/rpl/r/rpl_extraCol_myisam.result

+2 −2
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ Replicate_Ignore_Table # 
Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1364

Last_Error	Could not execute Write_rows event on table test.t9; Field 'e' doesn't have a default value, Error_code: 1364; handler error HA_ERR_ROWS_EVENT_APPLY; the event's master log master-bin.000001, end_log_pos 262

Last_Error	Could not execute Write_rows event on table test.t9; Field 'e' doesn't have a default value, Error_code: 1364; handler error HA_ERR_ROWS_EVENT_APPLY; the event's master log master-bin.000001, end_log_pos 330

Skip_Counter	0

Exec_Master_Log_Pos	#

Relay_Log_Space	#
@@ -452,7 +452,7 @@ Master_SSL_Verify_Server_Cert No 
Last_IO_Errno	#

Last_IO_Error	#

Last_SQL_Errno	1364

Last_SQL_Error	Could not execute Write_rows event on table test.t9; Field 'e' doesn't have a default value, Error_code: 1364; handler error HA_ERR_ROWS_EVENT_APPLY; the event's master log master-bin.000001, end_log_pos 262

Last_SQL_Error	Could not execute Write_rows event on table test.t9; Field 'e' doesn't have a default value, Error_code: 1364; handler error HA_ERR_ROWS_EVENT_APPLY; the event's master log master-bin.000001, end_log_pos 330

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

*** Create t10 on slave  ***

mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result

+0 −438

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test

+0 −2
Original line number Diff line number Diff line
@@ -526,7 +526,6 @@ sync_slave_with_master; 
# 



connection master;

let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1); 



# Just to get something that is non-trivial, albeit still simple, we

# stuff the result of USER() and CURRENT_USER() into a variable.
@@ -557,7 +556,6 @@ INSERT INTO t13 VALUES (my_user()); 
INSERT INTO t13 VALUES (CURRENT_USER());

INSERT INTO t13 VALUES (my_current_user());



source include/show_binlog_events.inc;

sync_slave_with_master;



# as we're using UUID we don't SELECT but use "diff" like in rpl_row_UUID