← Back to branch summary

~mordred/drizzle/fix-bell-bugs

« back to all changes in this revision

Viewing changes to plugin/myisam/myisam_priv.h

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/myisam_priv.h
21
21
#include "config.h"
22
22
#include "myisam.h"                     /* Structs & some defines */
23
23
#include "myisampack.h"                 /* packing of keys */
24
 
#include <mysys/my_tree.h>
25
 
#include <mysys/my_pthread.h>
26
 
#include <mysys/thr_lock.h>
 
24
#include "drizzled/my_tree.h"
 
25
#include "drizzled/internal/my_pthread.h"
 
26
#include <drizzled/thr_lock.h>
27
27
#include <drizzled/common.h>
28
28
 
29
29
#include <assert.h>
310
310
};
311
311
 
312
312
typedef struct st_buffpek {
313
 
  my_off_t file_pos;                    /* Where we are in the sort file */
 
313
  off_t file_pos;                    /* Where we are in the sort file */
314
314
  unsigned char *base,*key;                     /* Key pointers */
315
315
  ha_rows count;                        /* Number of rows in table */
316
316
  ulong mem_count;                      /* numbers of keys in memory */