Merge lp:~posulliv/drizzle/bug438387 into lp:~drizzle-trunk/drizzle/development

Proposed by Padraig O'Sullivan
Status: Merged
Merged at revision: not available
Proposed branch: lp:~posulliv/drizzle/bug438387
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 14 lines
1 file modified
drizzled/plugin/storage_engine.cc (+4/-0)
To merge this branch: bzr merge lp:~posulliv/drizzle/bug438387
Reviewer Review Type Date Requested Status
Jay Pipes (community) Approve
Stewart Smith (community) Approve
Review via email: mp+12560@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Padraig O'Sullivan (posulliv) wrote :

Contains a simple fix that removes the valgrind warnings for bugs 438407 and 438387.

-Padraig

Revision history for this message
Stewart Smith (stewart) :
review: Approve
Revision history for this message
Jay Pipes (jaypipes) wrote :

Yep, looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzled/plugin/storage_engine.cc'
2--- drizzled/plugin/storage_engine.cc 2009-08-19 23:35:29 +0000
3+++ drizzled/plugin/storage_engine.cc 2009-09-29 01:30:30 +0000
4@@ -890,6 +890,10 @@
5 TableNameIterator::~TableNameIterator()
6 {
7 delete current_implementation;
8+ if (current_implementation != default_implementation)
9+ {
10+ delete default_implementation;
11+ }
12 }
13
14 int TableNameIterator::next(std::string *name)