← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/csv/ha_tina.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/csv/ha_tina.cc
47
47
#include <drizzled/error.h>
48
48
#include <drizzled/table.h>
49
49
#include <drizzled/session.h>
 
50
#include "drizzled/memory/multi_malloc.h"
50
51
 
51
52
#include "ha_tina.h"
52
53
 
185
186
                                        (unsigned char*) table_name,
186
187
                                       length)))
187
188
  {
188
 
    if (!my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),
 
189
    if (!drizzled::memory::multi_malloc(true,
189
190
                         &share, sizeof(*share),
190
191
                         &tmp_name, length+1,
191
192
                         NULL))