~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/array.c

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
/* Handling of arrays that can grow dynamicly. */
17
17
 
18
18
#include "mysys_priv.h"
19
 
#include "m_string.h"
 
19
#include <mystrings/m_string.h>
20
20
 
21
21
/*
22
22
  Initiate dynamic array
202
202
  {
203
203
    if (idx >= array->max_element && allocate_dynamic(array, idx))
204
204
      return true;
205
 
    bzero((uchar*) (array->buffer+array->elements*array->size_of_element),
 
205
    memset((uchar*) (array->buffer+array->elements*array->size_of_element), 0,
206
206
          (idx - array->elements)*array->size_of_element);
207
207
    array->elements=idx+1;
208
208
  }
277
277
{
278
278
  if (idx >= array->elements)
279
279
  {
280
 
    bzero(element,array->size_of_element);
 
280
    memset(element, 0, array->size_of_element);
281
281
    return;
282
282
  }
283
283
  memcpy(element,array->buffer+idx*array->size_of_element,