← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.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:
drizzled/sql_base.cc
16
16
 
17
17
/* Basic functions needed by many modules */
18
18
#include <drizzled/server_includes.h>
19
 
#include <drizzled/field/timestamp.h>
20
 
#include <drizzled/field/null.h>
21
19
#include <assert.h>
22
20
 
23
21
#include <signal.h>
46
44
#include <drizzled/lock.h>
47
45
#include <drizzled/slot/listen.h>
48
46
#include <mysys/cached_directory.h>
 
47
#include <drizzled/field/timestamp.h>
 
48
#include <drizzled/field/null.h>
 
49
#include "drizzled/memory/multi_malloc.h"
49
50
 
50
51
using namespace std;
51
52
using namespace drizzled;
984
985
 
985
986
  /*
986
987
    Create a table entry with the right key and with an old refresh version
987
 
    Note that we must use my_multi_malloc() here as this is freed by the
 
988
    Note that we must use multi_malloc() here as this is freed by the
988
989
    table cache
989
990
  */
990
 
  if (!my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),
991
 
                       &table, sizeof(*table),
992
 
                       &share, sizeof(*share),
993
 
                       &key_buff, key_length,
994
 
                       NULL))
 
991
  if (! memory::multi_malloc(true,
 
992
                             &table, sizeof(*table),
 
993
                             &share, sizeof(*share),
 
994
                             &key_buff, key_length,
 
995
                             NULL))
995
996
    return NULL;
996
997
 
997
998
  table->s= share;