← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/ha_heap.cc

  • Committer: Jay Pipes
  • Date: 2009-08-20 18:26:40 UTC
  • mfrom: (1111.2.1 bug409350)
  • mto: This revision was merged to the branch mainline in revision 1120.
  • Revision ID: jpipes@serialcoder-20090820182640-sl0pr89rpztjoegc
Merge Monty's bug fix for 409350. HEAP handler incorrectly does not destroy mutex.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/ha_heap.cc
98
98
  registry.remove(heap_storage_engine);
99
99
  delete heap_storage_engine;
100
100
 
 
101
  int ret= hp_panic(HA_PANIC_CLOSE);
 
102
 
101
103
  pthread_mutex_destroy(&THR_LOCK_heap);
102
104
 
103
 
  return hp_panic(HA_PANIC_CLOSE);
 
105
  return ret;
104
106
}
105
107
 
106
108