Merge lp:~tsarev/percona-server/innodb_deadlock_788569 into lp:percona-server/5.1
Proposed by
Oleg Tsarev
Status: | Merged |
---|---|
Merged at revision: | 236 |
Proposed branch: | lp:~tsarev/percona-server/innodb_deadlock_788569 |
Merge into: | lp:percona-server/5.1 |
Diff against target: |
45 lines (+13/-2) 3 files modified
mysql-test/innodb_deadlock_count.patch/percona_innodb_deadlock_count.result (+5/-0) mysql-test/innodb_deadlock_count.patch/percona_innodb_deadlock_count.test (+8/-1) series (+0/-1) |
To merge this branch: | bzr merge lp:~tsarev/percona-server/innodb_deadlock_788569 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexey Kopytov (community) | Approve | ||
Valentine Gostev | qa | Pending | |
Review via email: mp+65374@code.launchpad.net |
This proposal supersedes a proposal from 2011-05-27.
Description of the change
Move tests from mysql-test/ to mysql-test/
Now test explicit return "ERROR 40001: Deadlock found when trying to get lock; try restarting transaction"
To post a comment you must log in.
good to go