← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to plugin/memory/hp_create.cc

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-06-19 10:46:49 UTC
  • mfrom: (1.1.6)
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20120619104649-e2l0ggd4oz3um0f4
Tags: upstream-7.1.36-stable
Import upstream version 7.1.36-stable

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/memory/hp_create.cc
14
14
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
15
15
 
16
16
#include "heap_priv.h"
17
 
 
 
17
#include <drizzled/internal/my_sys.h>
18
18
#include <drizzled/common.h>
19
19
#include <drizzled/error.h>
20
20
 
241
241
  return(0);
242
242
 
243
243
err:
244
 
  if (share && share->keydef && share->keydef->seg)
245
 
    delete [] share->keydef->seg;
246
244
  if (share && share->keydef)
247
 
    delete [] share->keydef;
 
245
    delete[] share->keydef->seg;
248
246
  if (share)
249
 
    delete share;
 
247
    delete[] share->keydef;
 
248
  delete share;
250
249
  if (not create_info->internal_table)
251
250
    THR_LOCK_heap.unlock();
252
251
  return(1);
318
317
  heap_share_list.remove(share);        /* If not internal table */
319
318
  hp_clear(share);                      /* Remove blocks from memory */
320
319
  if (share->keydef)
321
 
    delete [] share->keydef->seg;
322
 
  delete [] share->keydef;
 
320
    delete[] share->keydef->seg;
 
321
  delete[] share->keydef;
323
322
  delete share;
324
323
}