← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/myisamdef.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:
storage/myisam/myisamdef.h
18
18
#include "myisam.h"                     /* Structs & some defines */
19
19
#include "myisampack.h"                 /* packing of keys */
20
20
#include <my_tree.h>
21
 
#ifdef THREAD
22
21
#include <my_pthread.h>
23
22
#include <thr_lock.h>
24
 
#else
25
 
#include <my_no_pthread.h>
26
 
#endif
27
23
 
28
24
#if defined(my_write) && !defined(MAP_TO_USE_RAID)
29
25
#undef my_write                         /* undef map from my_nosys; We need test-if-disk full */
211
207
    not_flushed,
212
208
    temporary,delay_key_write,
213
209
    concurrent_insert;
214
 
#ifdef THREAD
215
210
  THR_LOCK lock;
216
211
  pthread_mutex_t intern_lock;          /* Locking for use with _locking */
217
212
  rw_lock_t *key_root_lock;
218
 
#endif
219
213
  my_off_t mmaped_length;
220
214
  uint     nonmmaped_inserts;           /* counter of writing in non-mmaped
221
215
                                           area */
304
298
#ifdef __WIN__
305
299
  my_bool owned_by_merge;                       /* This MyISAM table is part of a merge union */
306
300
#endif
307
 
#ifdef THREAD
308
301
  THR_LOCK_DATA lock;
309
 
#endif
310
302
  uchar  *rtree_recursion_state;        /* For RTREE */
311
303
  int     rtree_recursion_depth;
312
304
};
468
460
#define MI_UNIQUE_HASH_TYPE     HA_KEYTYPE_ULONG_INT
469
461
#define mi_unique_store(A,B)    mi_int4store((A),(B))
470
462
 
471
 
#ifdef THREAD
472
463
extern pthread_mutex_t THR_LOCK_myisam;
473
 
#endif
474
 
#if !defined(THREAD) || defined(DONT_USE_RW_LOCKS)
475
 
#define rw_wrlock(A) {}
476
 
#define rw_rdlock(A) {}
477
 
#define rw_unlock(A) {}
478
 
#endif
479
464
 
480
465
        /* Some extern variables */
481
466
 
784
769
int flush_pending_blocks(MI_SORT_PARAM *param);
785
770
int sort_ft_buf_flush(MI_SORT_PARAM *sort_param);
786
771
int thr_write_keys(MI_SORT_PARAM *sort_param);
787
 
#ifdef THREAD
788
772
pthread_handler_t thr_find_all_keys(void *arg);
789
 
#endif
790
773
int flush_blocks(MI_CHECK *param, KEY_CACHE *key_cache, File file);
791
774
 
792
775
int sort_write_record(MI_SORT_PARAM *sort_param);