← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Monty Taylor
  • Date: 2009-09-22 22:19:58 UTC
  • mto: This revision was merged to the branch mainline in revision 1184.
  • Revision ID: mordred@inaugust.com-20090922221958-l4d9ogwfs55513eo
Moved multi_malloc into drizzled since it's not going away any time soon. Also,
cleaned it up a bit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
51
51
#include <drizzled/field/timestamp.h>
52
52
#include <drizzled/plugin/storage_engine.h>
53
53
#include <drizzled/info_schema.h>
 
54
#include "drizzled/memory/multi_malloc.h"
54
55
 
55
56
/* Include necessary InnoDB headers */
56
57
extern "C" {
2594
2595
                                table->s->stored_rec_length
2595
2596
                                + table->s->max_key_length
2596
2597
                                + MAX_REF_PARTS * 3;
2597
 
        if (!(unsigned char*) my_multi_malloc(MYF(MY_WME),
 
2598
        if (!(unsigned char*) drizzled::memory::multi_malloc(false,
2598
2599
                        &upd_buff, upd_and_key_val_buff_len,
2599
2600
                        &key_val_buff, upd_and_key_val_buff_len,
2600
2601
                        NULL)) {