Drizzle

Merge lp:~mordred/drizzle/bug409350 into lp:~drizzle-trunk/drizzle/development

  1. bug409350
  2. Merge into development
Proposed by Monty Taylor
Status: Merged
Approved by: Jay Pipes
Approved revision: 1112
Merged at revision: not available
Proposed branch: lp:~mordred/drizzle/bug409350
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: None lines
To merge this branch: bzr merge lp:~mordred/drizzle/bug409350
Reviewer Review Type Date Requested Status
Jay Pipes (community) Approve
Review via email: mp+10327@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Monty Taylor (mordred) wrote :

I did this a while ago - not sure why I didn't propose for merging.

Revision history for this message
Jay Pipes (jaypipes) wrote :

Cool. Pulling in shortly.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugin/heap/ha_heap.cc'
2--- plugin/heap/ha_heap.cc 2009-07-31 23:20:14 +0000
3+++ plugin/heap/ha_heap.cc 2009-08-05 17:54:01 +0000
4@@ -98,9 +98,11 @@
5 registry.remove(heap_storage_engine);
6 delete heap_storage_engine;
7
8+ int ret= hp_panic(HA_PANIC_CLOSE);
9+
10 pthread_mutex_destroy(&THR_LOCK_heap);
11
12- return hp_panic(HA_PANIC_CLOSE);
13+ return ret;
14 }
15
16