diff options
author | unknown <msvensson@neptunus.(none)> | 2005-03-24 12:21:55 +0100 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2005-03-24 12:21:55 +0100 |
commit | 8287938b79b52a5c6c6a2304414e9a6d41b79e87 (patch) | |
tree | 13a30017ae1f2626fb8fb51858c6be03db5fb4e9 /mysql-test | |
parent | 3315fab91e02012b01783afa7cba02b43c5ae425 (diff) | |
parent | 2621e38bf950879dd339d780d565f44df837c8c4 (diff) | |
download | mariadb-git-8287938b79b52a5c6c6a2304414e9a6d41b79e87.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/README | 2 | ||||
-rw-r--r-- | mysql-test/r/rpl_deadlock.result | 6 | ||||
-rw-r--r-- | mysql-test/t/rpl_deadlock.test | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/mysql-test/README b/mysql-test/README index bccb05c555c..65e6186613a 100644 --- a/mysql-test/README +++ b/mysql-test/README @@ -17,7 +17,7 @@ http://dev.mysql.com/doc/mysql/en/MySQL_test_suite.html You can create your own test cases. To create a test case: - xeamacs t/test_case_name.test + xemacs t/test_case_name.test in the file, put a set of SQL commands that will create some tables, load test data, run some queries to manipulate it. diff --git a/mysql-test/r/rpl_deadlock.result b/mysql-test/r/rpl_deadlock.result index 366d18f3e05..8808a973855 100644 --- a/mysql-test/r/rpl_deadlock.result +++ b/mysql-test/r/rpl_deadlock.result @@ -8,6 +8,9 @@ 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'; +Variable_name Value +slave_transaction_retries 0 show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -20,6 +23,9 @@ t2 CREATE TABLE `t2` ( `a` int(11) NOT NULL default '0', KEY `a` (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 +show variables like 'slave_transaction_retries'; +Variable_name Value +slave_transaction_retries 2 stop slave; begin; insert into t3 select * from t2 for update; diff --git a/mysql-test/t/rpl_deadlock.test b/mysql-test/t/rpl_deadlock.test index 82470e8ebd0..9ad6362f7e7 100644 --- a/mysql-test/t/rpl_deadlock.test +++ b/mysql-test/t/rpl_deadlock.test @@ -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 |