← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/myisamdef.h

  • Committer: Padraig O'Sullivan
  • Date: 2009-03-28 06:01:24 UTC
  • mto: (968.2.5 mordred)
  • mto: This revision was merged to the branch mainline in revision 971.
  • Revision ID: osullivan.padraig@gmail.com-20090328060124-fdjygihvmr0kpf58
Reverting some refactoring changes I made to MyISAM that didn't really work
out.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/myisamdef.h
25
25
#include <mysys/my_pthread.h>
26
26
#include <mysys/thr_lock.h>
27
27
#include <drizzled/common.h>
28
 
#include <drizzled/session.h>
29
28
 
30
29
#include <string.h>
31
 
#include <list>
32
30
 
33
31
#if defined(my_write)
34
32
#undef my_write                         /* undef map from my_nosys; We need test-if-disk full */
173
171
  MI_COLUMNDEF *rec;                    /* Pointer to field information */
174
172
  MI_PACK    pack;                      /* Data about packed records */
175
173
  MI_BLOB    *blobs;                    /* Pointer to blobs */
176
 
  std::list<Session *> in_use;          /* List of threads using this table */
 
174
  LIST *in_use;                         /* List of threads using this table */
177
175
  char  *unique_file_name;              /* realpath() of index file */
178
176
  char  *data_file_name,                /* Resolved path names from symlinks */
179
177
        *index_file_name;
247
245
  MI_BIT_BUFF  bit_buff;
248
246
  /* accumulate indexfile changes between write's */
249
247
  TREE          *bulk_insert;
250
 
  Session *in_use;
 
248
  LIST in_use;                          /* Thread using this table          */
251
249
  char *filename;                       /* parameter to open filename       */
252
250
  unsigned char *buff,                          /* Temp area for key                */
253
251
        *lastkey,*lastkey2;             /* Last used search key             */
289
287
  uint  data_changed;                   /* Somebody has changed data */
290
288
  uint  save_update;                    /* When using KEY_READ */
291
289
  int   save_lastinx;
 
290
  LIST  open_list;
292
291
  IO_CACHE rec_cache;                   /* When cacheing records */
293
292
  uint32_t  preload_buff_size;              /* When preloading indexes */
294
293
  myf lock_wait;                        /* is 0 or MY_DONT_WAIT */
464
463
 
465
464
        /* Some extern variables */
466
465
 
467
 
extern std::list<MI_INFO *> myisam_open_list;
 
466
extern LIST *myisam_open_list;
468
467
extern unsigned char  myisam_file_magic[], myisam_pack_file_magic[];
469
468
extern uint32_t  myisam_read_vec[], myisam_readnext_vec[];
470
469
extern uint32_t myisam_quick_table_bits;