~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/memory/multi_malloc.cc

  • Committer: Lee Bieber
  • Date: 2010-10-21 01:33:55 UTC
  • mfrom: (1864.1.3 build)
  • Revision ID: kalebral@gmail.com-20101021013355-uywuclusdprnf8nl
Merge Brian - Add support for --with-valgrind
Merge Mark - event_observer.h did not declare "class Session;" so it depended on being #include'ed after "session.h".
Merge Andrew - Fix bug #663554: drizzledump is not honoring --destination-database option
Merge Andrew - Fix bug #663812: drizzledump truncation for DOUBLE data type with no preset scale/precision

Show diffs side-by-side

added added

removed removed

Lines of Context:
61
61
  }
62
62
  va_end(args);
63
63
 
 
64
#ifdef HAVE_VALGRIND
 
65
  if (!(start= calloc(0, tot_length)))
 
66
    return(0);
 
67
#else
64
68
  if (!(start= malloc(tot_length)))
65
69
    return(0);
66
70
  if (zerofill)
67
71
    memset(start, 0, tot_length);
 
72
#endif
68
73
 
69
74
  va_start(args, zerofill);
70
75
  res= static_cast<char *>(start);