← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_range.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_range.cc
20
20
 
21
21
#include "myisam_priv.h"
22
22
 
 
23
using namespace drizzled;
 
24
 
23
25
static ha_rows _mi_record_pos(MI_INFO *, const unsigned char *, key_part_map,
24
26
                              enum ha_rkey_function);
25
 
static double _mi_search_pos(MI_INFO *,MI_KEYDEF *,unsigned char *, uint,uint,my_off_t);
 
27
static double _mi_search_pos(MI_INFO *,MI_KEYDEF *,unsigned char *, uint,uint,internal::my_off_t);
26
28
static uint32_t _mi_keynr(MI_INFO *info,MI_KEYDEF *,unsigned char *, unsigned char *,uint32_t *);
27
29
 
28
30
/*
151
153
static double _mi_search_pos(register MI_INFO *info,
152
154
                             register MI_KEYDEF *keyinfo,
153
155
                             unsigned char *key, uint32_t key_len, uint32_t nextflag,
154
 
                             register my_off_t pos)
 
156
                             register internal::my_off_t pos)
155
157
{
156
158
  int flag;
157
159
  uint32_t nod_flag, keynr, max_keynr= 0;