Commit 1972aa7d authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/mysql_src/mysql-5.0-xa


sql/item_func.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
parents ecdfe7c2 463ee77d

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/item_func.cc

+10 −12
Original line number Diff line number Diff line
@@ -2856,18 +2856,6 @@ void item_user_lock_free(void) 
void item_user_lock_release(User_level_lock *ull)

{

  ull->locked=0;

  if (mysql_bin_log.is_open())

  {

    char buf[256];

    const char *command="DO RELEASE_LOCK(\"";

    String tmp(buf,sizeof(buf), system_charset_info);

    tmp.copy(command, strlen(command), tmp.charset());

    tmp.append(ull->key,ull->key_length);

    tmp.append("\")", 2);

    Query_log_event qev(current_thd, tmp.ptr(), tmp.length(), 0, FALSE);

    qev.error_code=0; // this query is always safe to run on slave

    mysql_bin_log.write(&qev);

  }

  if (--ull->count)

    pthread_cond_signal(&ull->cond);

  else
@@ -2991,6 +2979,16 @@ longlong Item_func_get_lock::val_int() 
  User_level_lock *ull;

  int error=0;



  /*

    In slave thread no need to get locks, everything is serialized. Anyway

    there is no way to make GET_LOCK() work on slave like it did on master

    (i.e. make it return exactly the same value) because we don't have the

    same other concurrent threads environment. No matter what we return here,

    it's not guaranteed to be same as on master.

  */

  if (thd->slave_thread)

    return 1;



  pthread_mutex_lock(&LOCK_user_locks);



  if (!res || !res->length())

sql/log_event.cc

+5 −5
Original line number Diff line number Diff line
@@ -1616,9 +1616,9 @@ Default database: '%s'. Query: '%s'", 
    probably, so data_buf will be freed, so the thd->... listed above will be

    pointers to freed memory. 

    So we must set them to 0, so that those bad pointers values are not later

    used. Note that "cleanup" queries (automatic DO RELEASE_LOCK() and DROP

    TEMPORARY TABLE don't suffer from these assignments to 0 as DROP TEMPORARY

    TABLE uses the db.table syntax).

    used. Note that "cleanup" queries like automatic DROP TEMPORARY TABLE

    don't suffer from these assignments to 0 as DROP TEMPORARY

    TABLE uses the db.table syntax.

  */

  thd->db= thd->catalog= 0;	        // prevent db from being freed

  thd->query= 0;			// just to be sure
@@ -3666,8 +3666,8 @@ void Stop_log_event::print(FILE* file, bool short_form, LAST_EVENT_INFO* last_ev 


  The master stopped.

  We used to clean up all temporary tables but this is useless as, as the

  master has shut down properly, it has written all DROP TEMPORARY TABLE and DO

  RELEASE_LOCK (prepared statements' deletion is TODO).

  master has shut down properly, it has written all DROP TEMPORARY TABLE

  (prepared statements' deletion is TODO only when we binlog prep stmts).

  We used to clean up slave_load_tmpdir, but this is useless as it has been

  cleared at the end of LOAD DATA INFILE.

  So we have nothing to do here.