mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-31 15:50:51 +03:00 
			
		
		
		
	This saves one byte per Query_log_event on disk compared to 5.0.[0..3]. Compatibility problems with 5.0.x where x<4 are explained in the comments in log_event.cc. Putting back s/my_open(O_TRUNC)/(my_delete+my_create) change which had been wiped away by somebody doing a wrong 4.1->5.0 merge (which happened just before 5.0.3 :( ). Applying it to new events for LOAD DATA INFILE. If slave fails in Execute_load_query_log_event::exec_event(), don't delete the file (so that it's re-usable at next START SLAVE). And (youpi!) fix for BUG#3247 "a partially completed LOAD DATA INFILE is not executed at all on the slave" (storing an Execute_load_query_log_event to binlog, with its error code, instead of Delete_file_log_event). mysql-test/r/mix_innodb_myisam_binlog.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_change_master.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_deadlock.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_error_ignored_table.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_flush_log_loop.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_loaddata.result: we now use one less byte when storing the catalog in binlog so positions change. Plus testing replication of LOAD DATA INFILE if duplicate key and non-transactional table. mysql-test/r/rpl_log.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_max_relay_size.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_relayrotate.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_replicate_do.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_rotate_logs.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/r/rpl_until.result: we now use one less byte when storing the catalog in binlog so positions change mysql-test/t/mysqlbinlog.test: we now use one less byte when storing the catalog in binlog so positions change mysql-test/t/mysqlbinlog2.test: we now use one less byte when storing the catalog in binlog so positions change mysql-test/t/rpl_deadlock.test: we now use one less byte when storing the catalog in binlog so positions change mysql-test/t/rpl_loaddata.test: we now use one less byte when storing the catalog in binlog so positions change. Plus testing replication of LOAD DATA INFILE if duplicate key and non-transactional table. mysql-test/t/rpl_until.test: we now use one less byte when storing the catalog in binlog so positions change sql/log_event.cc: a) We now store the catalog in Query_log_event in binlog WITHOUT its end zero. This saves one byte per Query_log_event on disk. Compatibility problems with 5.0.x where x<4 are explained in the comments in this file. b) putting back s/my_open(O_TRUNC)/(my_delete+my_create) change which had been wiped away by somebody doing a wrong 4.1->5.0 merge (which happened just before 5.0.3 :( ). Applying it to new events for LOAD DATA INFILE. c) if slave fails in Execute_load_query_log_event::exec_event(), don't delete the file (so that it's re-usable at next START SLAVE). sql/log_event.h: We now store the catalog in Query_log_event in binlog WITHOUT its end zero. This saves one byte per Query_log_event on disk. This new storage for the catalog is denoted by Q_CATALOG_NZ_CODE (couldn't re-use Q_CATALOG_CODE as 5.0.3 slaves of this 5.0.4 master would segfault because it would expect a 0 when there is none. Renaming get_open_mode() to get_create_or_append() (see log_event.cc) sql/sql_load.cc: Fix for BUG#3247: if LOAD DATA INFILE fails but has permanently updated a table (i.e. has deleted/added/modified some rows in a non-transactional table), we must write an Execute_load_query_log_event to binlog (with the error code, as this class beautifully inherits from Query_log_event, it can store the error code - thanks Dmitri) and not a Delete_file_log_event (we use to write a Delete_file_log_event: no update happened on slave, bug).
		
			
				
	
	
		
			112 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			112 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| # See if slave restarts the transaction after failing on an InnoDB deadlock error.
 | |
| 
 | |
| # Note: testing what happens when too many retries is possible, but
 | |
| # needs large waits when running with --debug, so we don't do it.
 | |
| # The same way, this test may not test what is expected when run
 | |
| # under Valgrind, timings are too short then (with --valgrind I
 | |
| # (Guilhem) have seen the test manage to provoke lock wait timeout
 | |
| # error but not deadlock error; that is ok as code deals with the two
 | |
| # errors in exactly the same way.
 | |
| # We don't 'show status like 'slave_retried_transactions'' because this
 | |
| # is not repeatable (depends on sleeps).
 | |
| 
 | |
| source include/have_innodb.inc;
 | |
| source include/master-slave.inc;
 | |
| 
 | |
| connection master;
 | |
| create table t1 (a int not null, key(a)) engine=innodb;
 | |
| create table t2 (a int not null, key(a)) engine=innodb;
 | |
| create table t3 (a int) engine=innodb;
 | |
| create table t4 (a int) engine=innodb;
 | |
| show variables like 'slave_transaction_retries';
 | |
| sync_slave_with_master;
 | |
| 
 | |
| show create table t1;
 | |
| show create table t2;
 | |
| show variables like 'slave_transaction_retries';
 | |
| stop slave;
 | |
| 
 | |
| # 1) Test deadlock
 | |
| 
 | |
| connection master;
 | |
| begin;
 | |
| # Let's keep BEGIN and the locked statement in two different relay logs.
 | |
| let $1=200;
 | |
| disable_query_log;
 | |
| while ($1)
 | |
| {
 | |
|  eval insert into t3 values( $1 );
 | |
|  dec $1;
 | |
| }
 | |
| enable_query_log;
 | |
| insert into t3 select * from t2 for update;
 | |
| insert into t1 values(1);
 | |
| commit;
 | |
| save_master_pos;
 | |
| 
 | |
| connection slave;
 | |
| begin;
 | |
| # Let's make our transaction large so that it's slave who is chosen as
 | |
| # victim
 | |
| let $1=1000;
 | |
| disable_query_log;
 | |
| while ($1)
 | |
| {
 | |
|  eval insert into t4 values( $1 );
 | |
|  dec $1;
 | |
| }
 | |
| enable_query_log;
 | |
| select * from t1 for update;
 | |
| start slave;
 | |
| --sleep 3; # hope that slave is blocked now
 | |
| insert into t2 values(22); # provoke deadlock, slave should be victim
 | |
| commit;
 | |
| sync_with_master;
 | |
| select * from t1; # check that slave succeeded finally
 | |
| select * from t2;
 | |
| # check that no error is reported
 | |
| --replace_column 1 # 8 # 9 # 23 # 33 #
 | |
| --replace_result $MASTER_MYPORT MASTER_MYPORT
 | |
| show slave status;
 | |
| 
 | |
| # 2) Test lock wait timeout
 | |
| 
 | |
| stop slave;
 | |
| change master to master_log_pos=532; # the BEGIN log event
 | |
| begin;
 | |
| select * from t2 for update; # hold lock
 | |
| start slave;
 | |
| --sleep 10; # slave should have blocked, and be retrying
 | |
| commit;
 | |
| sync_with_master;
 | |
| select * from t1; # check that slave succeeded finally
 | |
| select * from t2;
 | |
| # check that no error is reported
 | |
| --replace_column 1 # 8 # 9 # 23 # 33 #
 | |
| --replace_result $MASTER_MYPORT MASTER_MYPORT
 | |
| show slave status;
 | |
| 
 | |
| # Now we repeat 2), but with BEGIN in the same relay log as
 | |
| # COMMIT (to see if seeking into hot log is ok).
 | |
| 
 | |
| set global max_relay_log_size=0;
 | |
| 
 | |
| # This is really copy-paste of 2) of above
 | |
| stop slave;
 | |
| change master to master_log_pos=532;
 | |
| begin;
 | |
| select * from t2 for update;
 | |
| start slave;
 | |
| --sleep 10;
 | |
| commit;
 | |
| sync_with_master;
 | |
| select * from t1;
 | |
| select * from t2;
 | |
| --replace_column 1 # 8 # 9 # 23 # 33 #
 | |
| --replace_result $MASTER_MYPORT MASTER_MYPORT
 | |
| show slave status;
 | |
| 
 | |
| connection master;
 | |
| drop table t1,t2;
 | |
| sync_slave_with_master;
 |