← Back to branch summary

~mordred/drizzle/fix-bell-bugs

« back to all changes in this revision

Viewing changes to plugin/heap/heap_priv.h

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/heap_priv.h
20
20
#include "config.h"
21
21
#include <drizzled/base.h>
22
22
 
23
 
#include <mysys/my_sys.h>
24
 
#include <mystrings/m_ctype.h>
25
 
#include <mysys/my_pthread.h>
 
23
#include "drizzled/internal/my_sys.h"
 
24
#include "drizzled/charset_info.h"
 
25
#include "drizzled/internal/my_pthread.h"
26
26
#include "heap.h"                       /* Structs & some defines */
27
 
#include <mysys/my_tree.h>
 
27
#include "drizzled/my_tree.h"
28
28
#include <list>
29
29
 
30
30
/*
50
50
 
51
51
#define test_active(info) \
52
52
if (!(info->update & HA_STATE_AKTIV))\
53
 
{ my_errno=HA_ERR_NO_ACTIVE_RECORD; return(-1); }
 
53
{ errno=HA_ERR_NO_ACTIVE_RECORD; return(-1); }
54
54
#define hp_find_hash(A,B) ((HASH_INFO*) hp_find_block((A),(B)))
55
55
 
56
56
        /* Find pos for record and update it in info->current_ptr */