~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/array.cc

  • Committer: Monty Taylor
  • Date: 2008-11-07 00:37:57 UTC
  • mfrom: (575.3.1 c++ize)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: monty@inaugust.com-20081107003757-ahi7yycs9t23sima
MergedĀ fromĀ c++ize.

Show diffs side-by-side

added added

removed removed

Lines of Context:
60
60
  array->max_element=init_alloc;
61
61
  array->alloc_increment=alloc_increment;
62
62
  array->size_of_element=element_size;
63
 
  if ((array->buffer= init_buffer))
 
63
  if ((array->buffer= (unsigned char*) init_buffer))
64
64
    return(false);
65
65
  if (!(array->buffer=(unsigned char*) my_malloc_ci(element_size*init_alloc,
66
66
                                            MYF(MY_WME))))