← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to include/heap.h

  • Committer: Monty Taylor
  • Date: 2008-07-02 14:35:48 UTC
  • mto: This revision was merged to the branch mainline in revision 51.
  • Revision ID: monty@inaugust.com-20080702143548-onj30ry0sugr01uw
Removed all references to THREAD.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/heap.h
25
25
#ifndef _my_base_h
26
26
#include <my_base.h>
27
27
#endif
28
 
#ifdef THREAD
29
28
#include <my_pthread.h>
30
29
#include <thr_lock.h>
31
 
#endif
32
30
 
33
31
#include "my_handler.h"
34
32
#include "my_tree.h"
146
144
  uint open_count;
147
145
  uchar *del_link;                      /* Link to next block with del. rec */
148
146
  char * name;                  /* Name of "memory-file" */
149
 
#ifdef THREAD
150
147
  THR_LOCK lock;
151
148
  pthread_mutex_t intern_lock;          /* Locking for use with _locking */
152
 
#endif
153
149
  my_bool delete_on_close;
154
150
  LIST open_list;
155
151
  uint auto_key;
175
171
  TREE_ELEMENT **last_pos;
176
172
  uint lastkey_len;
177
173
  my_bool implicit_emptied;
178
 
#ifdef THREAD
179
174
  THR_LOCK_DATA lock;
180
 
#endif
181
175
  LIST open_list;
182
176
} HP_INFO;
183
177