← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/myisam_priv.h

  • Committer: Mark Atwood
  • Date: 2011-12-27 16:09:18 UTC
  • mfrom: (2461.2.1 trunk)
  • Revision ID: me@mark.atwood.name-20111227160918-ai7t6ka9s9xlmlbv
resolve and merge lp:~ivolucien/drizzle/trunk-bug-621861

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/myisam_priv.h
21
21
 
22
22
#include "myisam.h"                     /* Structs & some defines */
23
23
#include "myisampack.h"                 /* packing of keys */
24
 
#include <drizzled/tree.h>
 
24
#include <drizzled/memory/root.h>
 
25
 
25
26
#include <drizzled/internal/my_pthread.h>
26
27
#include <drizzled/thr_lock.h>
27
28
#include <drizzled/common.h>
36
37
 
37
38
#include <boost/thread/mutex.hpp>
38
39
 
 
40
namespace drizzled {
 
41
class Tree;
 
42
}
 
43
 
39
44
#if defined(my_write)
40
45
#undef my_write                         /* undef map from my_nosys; We need test-if-disk full */
41
46
#endif
249
254
  MI_BLOB     *blobs;                   /* Pointer to blobs */
250
255
  MI_BIT_BUFF  bit_buff;
251
256
  /* accumulate indexfile changes between write's */
252
 
  drizzled::TREE                *bulk_insert;
 
257
  drizzled::Tree        *bulk_insert;
253
258
  drizzled::Session *in_use;                      /* Thread using this table          */
254
259
  char *filename;                       /* parameter to open filename       */
255
260
  unsigned char *buff,                          /* Temp area for key                */