mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-25 18:38:00 +03:00 
			
		
		
		
	- Eliminating some compiler warnings mysql-test/extra/binlog_tests/blackhole.test: Using include file for SHOW BINLOG EVENTS. mysql-test/extra/binlog_tests/drop_temp_table.test: Using include file for SHOW BINLOG EVENTS. mysql-test/extra/binlog_tests/insert_select-binlog.test: Using include file for SHOW BINLOG EVENTS. mysql-test/extra/rpl_tests/rpl_log.test: Using include file for SHOW BINLOG EVENTS. mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test: Using include file for SHOW BINLOG EVENTS. mysql-test/extra/rpl_tests/rpl_truncate_helper.test: Using include file for SHOW BINLOG EVENTS. mysql-test/include/show_binlog_events.inc: Fixing regex replace to handle XIDs as well. mysql-test/r/binlog_row_binlog.result: Result change mysql-test/r/binlog_row_blackhole.result: Result change mysql-test/r/binlog_row_ctype_ucs.result: Result change mysql-test/r/binlog_row_drop_tmp_tbl.result: Result change mysql-test/r/binlog_row_insert_select.result: Result change mysql-test/r/binlog_row_mix_innodb_myisam.result: Result change mysql-test/r/binlog_stm_binlog.result: Result change mysql-test/r/binlog_stm_blackhole.result: Result change mysql-test/r/binlog_stm_drop_tmp_tbl.result: Result change mysql-test/r/binlog_stm_insert_select.result: Result change mysql-test/r/binlog_stm_mix_innodb_myisam.result: Result change mysql-test/r/ctype_cp932_binlog_row.result: Result change mysql-test/r/rpl_ndb_charset.result: Result change mysql-test/r/rpl_ndb_log.result: Result change mysql-test/r/rpl_ndb_multi.result: Result change mysql-test/r/rpl_row_basic_11bugs.result: Result change mysql-test/r/rpl_row_charset.result: Result change mysql-test/r/rpl_row_create_table.result: Result change mysql-test/r/rpl_row_delayed_ins.result: Result change mysql-test/r/rpl_row_drop.result: Result change mysql-test/r/rpl_row_flsh_tbls.result: Result change mysql-test/r/rpl_row_inexist_tbl.result: Result change mysql-test/r/rpl_row_log.result: Result change mysql-test/r/rpl_row_log_innodb.result: Result change mysql-test/r/rpl_row_reset_slave.result: Result change mysql-test/r/rpl_row_until.result: Result change mysql-test/r/rpl_stm_log.result: Result change mysql-test/r/rpl_truncate_2myisam.result: Result change mysql-test/r/rpl_truncate_3innodb.result: Result change mysql-test/r/rpl_udf.result: Result change mysql-test/t/binlog_row_mix_innodb_myisam.test: Fixing binary log position mysql-test/t/binlog_stm_mix_innodb_myisam.test: Fixing binary log position. sql/log_event.cc: Eliminating compiler warnings.
		
			
				
	
	
		
			33 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			33 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| # This is a wrapper for binlog.test so that the same test case can be used 
 | |
| # For both statement and row based bin logs 9/19/2005 [jbm]
 | |
| 
 | |
| -- source include/have_binlog_format_row.inc
 | |
| 
 | |
| # Bug#18326: Do not lock table for writing during prepare of statement
 | |
| # The use of the ps protocol causes extra table maps in the binlog, so
 | |
| # we disable the ps-protocol for this statement.
 | |
| --disable_ps_protocol
 | |
| 
 | |
| -- source extra/binlog_tests/mix_innodb_myisam_binlog.test
 | |
| 
 | |
| --enable_ps_protocol
 | |
| 
 | |
| # This piece below cannot be put into
 | |
| # extra/binlog_tests/mix_innodb_myisam_binlog.test
 | |
| # because the argument of --start-position differs between statement-
 | |
| # and row-based (and "eval --exec" doesn't work).
 | |
| # we check that the error code of the "ROLLBACK" event is 0 and not
 | |
| # ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction
 | |
| # and does not make slave to stop)
 | |
| flush logs;
 | |
| --exec $MYSQL_BINLOG --start-position=520 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output
 | |
| --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 | |
| eval select
 | |
| (@a:=load_file("$MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output"))
 | |
| is not null;
 | |
| --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 | |
| eval select
 | |
| @a like "%#%error_code=0%ROLLBACK/*!*/;%ROLLBACK /* added by mysqlbinlog */;%",
 | |
| @a not like "%#%error_code=%error_code=%";
 | |
| drop table t1, t2;
 |