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

Merge lp:~percona-dev/percona-server/release-5.1.47-11-deadlock-test-fix into lp:percona-server/release-5.1.47-11

Proposed by Oleg Tsarev on 2010-05-27

Status:	Merged
Approved by:	Vadim Tkachenko on 2010-05-27
Approved revision:	no longer in the source branch.
Merged at revision:	15
Proposed branch:	lp:~percona-dev/percona-server/release-5.1.47-11-deadlock-test-fix
Merge into:	lp:percona-server/release-5.1.47-11
Diff against target:	22 lines (+7/-0) 2 files modified mysql-test/percona_innodb_deadlock_count.result (+2/-0) mysql-test/percona_innodb_deadlock_count.test (+5/-0)
To merge this branch:	bzr merge lp:~percona-dev/percona-server/release-5.1.47-11-deadlock-test-fix
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Vadim Tkachenko		2010-05-27	Approve on 2010-05-27
Review via email: mp+26230@code.launchpad.net

Fix tests for innodb_deadlock_count feature

Revision history for this message

Vadim Tkachenko (vadim-tk) on 2010-05-27:

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'mysql-test/percona_innodb_deadlock_count.result'
2	--- mysql-test/percona_innodb_deadlock_count.result 2010-05-27 18:31:05 +0000
3	+++ mysql-test/percona_innodb_deadlock_count.result 2010-05-27 19:15:41 +0000
4	@@ -24,3 +24,5 @@
5	SELECT b FROM t WHERE a=1 FOR UPDATE;
6	# Switch to connection con3
7	1
8	+# Drop test table
9	+drop table if exists t;
10
11	=== modified file 'mysql-test/percona_innodb_deadlock_count.test'
12	--- mysql-test/percona_innodb_deadlock_count.test 2010-05-27 18:31:05 +0000
13	+++ mysql-test/percona_innodb_deadlock_count.test 2010-05-27 19:15:41 +0000
14	@@ -44,3 +44,8 @@
15
16	let $diff = `SELECT $result - $current`;
17	echo $diff;
18	+--echo # Drop test table
19	+--disable_warnings
20	+drop table if exists t;
21	+--enable_warnings
22	+disable_abort_on_error;