Merge lp:~stewart/drizzle/bug718549 into lp:drizzle/7.0

Proposed by Stewart Smith
Status: Merged
Approved by: Brian Aker
Approved revision: 2176
Merged at revision: 2169
Proposed branch: lp:~stewart/drizzle/bug718549
Merge into: lp:drizzle/7.0
Prerequisite: lp:~stewart/drizzle/fix-haildb
Diff against target: 11 lines (+1/-0)
1 file modified
plugin/haildb/haildb_engine.cc (+1/-0)
To merge this branch: bzr merge lp:~stewart/drizzle/bug718549
Reviewer Review Type Date Requested Status
Drizzle Developers Pending
Review via email: mp+49592@code.launchpad.net

Description of the change

pretty sure this was causing some sysbench-rw high multithreaded failures with HailDB.

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 'plugin/haildb/haildb_engine.cc'
2--- plugin/haildb/haildb_engine.cc 2011-02-11 01:06:19 +0000
3+++ plugin/haildb/haildb_engine.cc 2011-02-14 06:05:37 +0000
4@@ -275,6 +275,7 @@
5 return HA_ERR_LOCK_DEADLOCK;
6
7 case DB_LOCK_WAIT_TIMEOUT:
8+ session->markTransactionForRollback(false);
9 return HA_ERR_LOCK_WAIT_TIMEOUT;
10
11 case DB_NO_REFERENCED_ROW:

Subscribers

People subscribed via source and target branches