← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/myisamdef.h

Merged padraig's removal of list.

Show diffs side-by-side

added added

removed removed

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