← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/tree.c

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/tree.c
54
54
*/
55
55
 
56
56
#include "mysys_priv.h"
57
 
#include <m_string.h>
58
 
#include <my_tree.h>
59
 
#include "my_base.h"
 
57
#include <mystrings/m_string.h>
 
58
#include <mysys/my_tree.h>
60
59
 
61
60
#define BLACK           1
62
61
#define RED             0
82
81
  if (default_alloc_size < DEFAULT_ALLOC_SIZE)
83
82
    default_alloc_size= DEFAULT_ALLOC_SIZE;
84
83
  default_alloc_size= MY_ALIGN(default_alloc_size, DEFAULT_ALIGN_SIZE);
85
 
  bzero((uchar*) &tree->null_element,sizeof(tree->null_element));
 
84
  memset((uchar*) &tree->null_element, 0, sizeof(tree->null_element));
86
85
  tree->root= &tree->null_element;
87
86
  tree->compare=compare;
88
87
  tree->size_of_element=size > 0 ? (uint) size : 0;