← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mulalloc.cc

  • Committer: Monty Taylor
  • Date: 2009-03-04 02:16:28 UTC
  • mto: (917.1.2 mordred)
  • mto: This revision was merged to the branch mainline in revision 912.
  • Revision ID: mordred@inaugust.com-20090304021628-rfq0b16uoi09g8tx
Fix to make VPATH builds work again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mulalloc.cc
15
15
 
16
16
#include "mysys_priv.h"
17
17
#include <stdarg.h>
 
18
#include <string.h>
 
19
#include <stdlib.h>
18
20
 
19
21
/*
20
22
  Malloc many pointers at the same time
46
48
  }
47
49
  va_end(args);
48
50
 
49
 
  if (!(start=(char *) my_malloc(tot_length,myFlags)))
 
51
  if (!(start=(char *) malloc(tot_length)))
50
52
    return(0); /* purecov: inspected */
 
53
  if (myFlags & MY_ZEROFILL)
 
54
    memset(start, 0, tot_length);
51
55
 
52
56
  va_start(args,myFlags);
53
57
  res=start;