← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/heap.h

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/heap.h
25
25
#ifndef _my_base_h
26
26
#include <my_base.h>
27
27
#endif
28
 
#include <my_pthread.h>
29
 
#include <thr_lock.h>
 
28
#include <mysys/my_pthread.h>
 
29
#include <mysys/thr_lock.h>
30
30
 
31
 
#include "my_handler.h"
32
 
#include "my_tree.h"
 
31
#include <mysys/my_handler.h>
 
32
#include <mysys/my_tree.h>
33
33
 
34
34
        /* defines used by heap-funktions */
35
35
 
111
111
  uint flag;                            /* HA_NOSAME | HA_NULL_PART_KEY */
112
112
  uint keysegs;                         /* Number of key-segment */
113
113
  uint length;                          /* Length of key (automatic) */
114
 
  uint8 algorithm;                      /* HASH / BTREE */
 
114
  uint8_t algorithm;                    /* HASH / BTREE */
115
115
  HA_KEYSEG *seg;
116
116
  HP_BLOCK block;                       /* Where keys are saved */
117
117
  /*