Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~tsarev/percona-server/5.1_fix_bug_800559 into lp:percona-server/5.1

  1. 5.1_fix_bug_800559
  2. Merge into 5.1
Proposed by Oleg Tsarev
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 240
Proposed branch: lp:~tsarev/percona-server/5.1_fix_bug_800559
Merge into: lp:percona-server/5.1
Diff against target: 82 lines (+12/-12)
2 files modified
mysql-test/innodb_deadlock_count.patch/percona_innodb_deadlock_count.result (+3/-8)
mysql-test/innodb_deadlock_count.patch/percona_innodb_deadlock_count.test (+9/-4)
To merge this branch: bzr merge lp:~tsarev/percona-server/5.1_fix_bug_800559
Reviewer Review Type Date Requested Status
Percona developers Pending
Review via email: mp+65472@code.launchpad.net

Description of the change

innodb_deadlock_count.test:
  * fix bug #800559
  * sync tests between PS 5.1 and PS 5.5

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysql-test/innodb_deadlock_count.patch/percona_innodb_deadlock_count.result'
2--- mysql-test/innodb_deadlock_count.patch/percona_innodb_deadlock_count.result 2011-06-21 16:37:54 +0000
3+++ mysql-test/innodb_deadlock_count.patch/percona_innodb_deadlock_count.result 2011-06-22 10:58:24 +0000
4@@ -11,23 +11,18 @@
5 # Switch to connection con1
6 BEGIN;
7 SELECT b FROM t WHERE a=1 FOR UPDATE;
8-b
9-2
10 # Switch to connection con2
11 BEGIN;
12 SELECT b FROM t WHERE a=2 FOR UPDATE;
13-b
14-1
15 # Switch to connection con1
16 SELECT b FROM t WHERE a=2 FOR UPDATE;
17 # Switch to connection con2
18 SELECT b FROM t WHERE a=1 FOR UPDATE;
19 # Switch to connection con1
20-b
21-1
22+ROLLBACK;
23 # Switch to connection con2
24-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
25+ROLLBACK;
26 # Switch to connection con3
27-1
28+Deadlocks: 1
29 # Drop test table
30 drop table t;
31
32=== modified file 'mysql-test/innodb_deadlock_count.patch/percona_innodb_deadlock_count.test'
33--- mysql-test/innodb_deadlock_count.patch/percona_innodb_deadlock_count.test 2011-06-21 16:37:54 +0000
34+++ mysql-test/innodb_deadlock_count.patch/percona_innodb_deadlock_count.test 2011-06-22 10:58:24 +0000
35@@ -9,7 +9,6 @@
36 --disable_warnings
37 drop table if exists t;
38 --enable_warnings
39-disable_abort_on_error;
40
41 --echo # Create test table
42 create table t(a INT PRIMARY KEY, b INT) engine=InnoDB;
43@@ -20,12 +19,12 @@
44 #--echo # Save current deadlock count
45 let $current = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_deadlocks'`;
46
47+--disable_result_log
48+
49 --echo # Switch to connection con1
50 connection con1;
51 BEGIN; SELECT b FROM t WHERE a=1 FOR UPDATE;
52
53-#show engine innodb status;
54-
55 --echo # Switch to connection con2
56 connection con2;
57 BEGIN; SELECT b FROM t WHERE a=2 FOR UPDATE;
58@@ -40,17 +39,23 @@
59
60 --echo # Switch to connection con1
61 connection con1;
62+--error 0, ER_LOCK_DEADLOCK
63 reap;
64+ROLLBACK;
65
66 --echo # Switch to connection con2
67 connection con2;
68+--error 0, ER_LOCK_DEADLOCK
69 reap;
70+ROLLBACK;
71
72 --echo # Switch to connection con3
73 connection con3;
74 let $result = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_deadlocks'`;
75
76+--enable_result_log
77+
78 let $diff = `SELECT $result - $current`;
79-echo $diff;
80+echo Deadlocks: $diff;
81 --echo # Drop test table
82 drop table t;

Subscribers

People subscribed via source and target branches