← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/myisam_priv.h

  • Committer: Andrew Hutchings
  • Date: 2011-01-04 11:36:01 UTC
  • mto: This revision was merged to the branch mainline in revision 2057.
  • Revision ID: andrew@linuxjedi.co.uk-20110104113601-diiveyfl32dgaa6f
https://launchpad.net/bugs/639716
Refix using placement new for join code, vector for join cache buffer.
Also refix a bug in COND_CMP properly

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/myisam_priv.h
18
18
#ifndef PLUGIN_MYISAM_MYISAM_PRIV_H
19
19
#define PLUGIN_MYISAM_MYISAM_PRIV_H
20
20
 
21
 
#include <config.h>
22
 
 
 
21
#include "config.h"
23
22
#include "myisam.h"                     /* Structs & some defines */
24
23
#include "myisampack.h"                 /* packing of keys */
25
 
#include <drizzled/tree.h>
26
 
#include <drizzled/internal/my_pthread.h>
 
24
#include "drizzled/tree.h"
 
25
#include "drizzled/internal/my_pthread.h"
27
26
#include <drizzled/thr_lock.h>
28
27
#include <drizzled/common.h>
29
 
#include <drizzled/enum.h>
30
28
 
31
29
#include <assert.h>
32
30
#include <fcntl.h>
688
686
                                    int file, drizzled::internal::my_off_t filepos);
689
687
extern void _my_store_blob_length(unsigned char *pos,uint32_t pack_length,uint32_t length);
690
688
extern void mi_report_error(int errcode, const char *file_name);
691
 
extern void mi_report_error(drizzled::error_t errcode, const char *file_name);
692
689
extern size_t mi_mmap_pread(MI_INFO *info, unsigned char *Buffer,
693
690
                            size_t Count, drizzled::internal::my_off_t offset, drizzled::myf MyFlags);
694
691
extern size_t mi_mmap_pwrite(MI_INFO *info, const unsigned char *Buffer,