← 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: Brian Aker
  • Date: 2009-10-15 18:32:22 UTC
  • mfrom: (1130.3.47 memory-file-moves)
  • Revision ID: brian@gaz-20091015183222-n79fjde41epz9u6g
Merge memory

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
77
77
#include "drizzled/field/timestamp.h"
78
78
#include "drizzled/plugin/storage_engine.h"
79
79
#include "drizzled/plugin/info_schema_table.h"
 
80
#include "drizzled/memory/multi_malloc.h"
80
81
 
81
82
/** @file ha_innodb.cc */
82
83
 
2720
2721
                                table->s->stored_rec_length
2721
2722
                                + table->s->max_key_length
2722
2723
                                + MAX_REF_PARTS * 3;
2723
 
        if (!(unsigned char*) my_multi_malloc(MYF(MY_WME),
 
2724
        if (!(unsigned char*) drizzled::memory::multi_malloc(false,
2724
2725
                        &upd_buff, upd_and_key_val_buff_len,
2725
2726
                        &key_val_buff, upd_and_key_val_buff_len,
2726
2727
                        NULL)) {