Commit 91820633 authored by unknown's avatar unknown
Browse files

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/mysql_src/mysql-4.1-clean


sql/mysqld.cc:
  Auto merged
parents 26f75ffc d7e0784c

mysql-test/r/rpl_deadlock.result

0 → 100644
+81 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

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 create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) NOT NULL default '0',

  KEY `a` (`a`)

) ENGINE=InnoDB DEFAULT CHARSET=latin1

show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `a` int(11) NOT NULL default '0',

  KEY `a` (`a`)

) ENGINE=InnoDB DEFAULT CHARSET=latin1

stop slave;

begin;

insert into t3 select * from t2 for update;

insert into t1 values(1);

commit;

begin;

select * from t1 for update;

a

start slave;

insert into t2 values(22);

commit;

select * from t1;

a

1

select * from t2;

a

22

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	13110	#	#	master-bin.000001	Yes	Yes							0		0	13110	#	None		0	No						#

stop slave;

change master to master_log_pos=401;

begin;

select * from t2 for update;

a

22

start slave;

commit;

select * from t1;

a

1

1

select * from t2;

a

22

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	13110	#	#	master-bin.000001	Yes	Yes							0		0	13110	#	None		0	No						#

set global max_relay_log_size=0;

stop slave;

change master to master_log_pos=401;

begin;

select * from t2 for update;

a

22

start slave;

commit;

select * from t1;

a

1

1

1

select * from t2;

a

22

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	13110	#	#	master-bin.000001	Yes	Yes							0		0	13110	#	None		0	No						#

drop table t1,t2;

mysql-test/t/rpl_deadlock-slave.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--innodb --loose-innodb_lock_wait_timeout=4 --slave-transaction-retries=2 --max-relay-log-size=4096

mysql-test/t/rpl_deadlock.test

0 → 100644
+107 −0
Original line number Diff line number Diff line 
# 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.



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;

sync_slave_with_master;



show create table t1;

show create table t2;

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=401; # 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=401;

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;

sql/mysql_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ extern ulong ha_read_first_count, ha_read_last_count; 
extern ulong ha_read_rnd_count, ha_read_rnd_next_count, ha_discover_count;

extern ulong ha_commit_count, ha_rollback_count,table_cache_size;

extern ulong max_connections,max_connect_errors, connect_timeout;

extern ulong slave_net_timeout;

extern ulong slave_net_timeout, slave_trans_retries;

extern ulong max_user_connections;

extern ulong long_query_count, what_to_log,flush_time;

extern ulong query_buff_size, thread_stack,thread_stack_min;

sql/mysqld.cc

+9 −3
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ ulong server_id, thd_startup_options; 
ulong table_cache_size, thread_stack, thread_stack_min, what_to_log;

ulong query_buff_size, slow_launch_time, slave_open_temp_tables;

ulong open_files_limit, max_binlog_size, max_relay_log_size;

ulong slave_net_timeout;

ulong slave_net_timeout, slave_trans_retries;

ulong thread_cache_size=0, binlog_cache_size=0, max_binlog_cache_size=0;

ulong query_cache_size=0;

ulong com_stat[(uint) SQLCOM_END], com_other;
@@ -4108,7 +4108,7 @@ enum options_mysqld 
  OPT_QUERY_CACHE_TYPE, OPT_QUERY_CACHE_WLOCK_INVALIDATE, OPT_RECORD_BUFFER,

  OPT_RECORD_RND_BUFFER, OPT_RELAY_LOG_SPACE_LIMIT, OPT_RELAY_LOG_PURGE,

  OPT_SLAVE_NET_TIMEOUT, OPT_SLAVE_COMPRESSED_PROTOCOL, OPT_SLOW_LAUNCH_TIME,

  OPT_READONLY, OPT_DEBUGGING,

  OPT_SLAVE_TRANS_RETRIES, OPT_READONLY, OPT_DEBUGGING,

  OPT_SORT_BUFFER, OPT_TABLE_CACHE,

  OPT_THREAD_CONCURRENCY, OPT_THREAD_CACHE_SIZE,

  OPT_TMP_TABLE_SIZE, OPT_THREAD_STACK,
@@ -5061,7 +5061,7 @@ The minimum value for this variable is 4096.", 
    (gptr*) &max_system_variables.max_length_for_sort_data, 0, GET_ULONG,

    REQUIRED_ARG, 1024, 4, 8192*1024L, 0, 1, 0},

  {"max_relay_log_size", OPT_MAX_RELAY_LOG_SIZE,

   "If non-zero: relay log will be rotated automatically when the size exceeds this value; if zero (the default): when the size exceeds max_binlog_size. 0 expected, the minimum value for this variable is 4096.",

   "If non-zero: relay log will be rotated automatically when the size exceeds this value; if zero (the default): when the size exceeds max_binlog_size. 0 excepted, the minimum value for this variable is 4096.",

   (gptr*) &max_relay_log_size, (gptr*) &max_relay_log_size, 0, GET_ULONG,

   REQUIRED_ARG, 0L, 0L, 1024*1024L*1024L, 0, IO_SIZE, 0},

  { "max_seeks_for_key", OPT_MAX_SEEKS_FOR_KEY,
@@ -5232,6 +5232,12 @@ The minimum value for this variable is 4096.", 
   "Number of seconds to wait for more data from a master/slave connection before aborting the read.",

   (gptr*) &slave_net_timeout, (gptr*) &slave_net_timeout, 0,

   GET_ULONG, REQUIRED_ARG, SLAVE_NET_TIMEOUT, 1, LONG_TIMEOUT, 0, 1, 0},

  {"slave_transaction_retries", OPT_SLAVE_TRANS_RETRIES,

   "Number of times the slave SQL thread will retry a transaction in case "

   "it failed with a deadlock or elapsed lock wait timeout, "

   "before giving up and stopping.",

   (gptr*) &slave_trans_retries, (gptr*) &slave_trans_retries, 0,

   GET_ULONG, REQUIRED_ARG, 0L, 0L, (longlong) ULONG_MAX, 0, 1, 0},

#endif /* HAVE_REPLICATION */

  {"slow_launch_time", OPT_SLOW_LAUNCH_TIME,

   "If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented.",