database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita


sql/mysqld.cc:
  Auto merged
This commit is contained in:
unknown
2005-03-24 15:44:50 +01:00
parent ca68bca8f4 23da6e5e31
commit e6717497e4
8 changed files with 63 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/t/rpl_deadlock.test
View File

@ -7,6 +7,8 @@
# (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;
@ -16,10 +18,12 @@ 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