← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_page.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_page.cc
17
17
 
18
18
#include "myisam_priv.h"
19
19
 
 
20
using namespace drizzled;
 
21
 
20
22
        /* Fetch a key-page in memory */
21
23
 
22
24
unsigned char *_mi_fetch_keypage(register MI_INFO *info, MI_KEYDEF *keyinfo,
23
 
                         my_off_t page, int level,
 
25
                         internal::my_off_t page, int level,
24
26
                         unsigned char *buff, int return_buffer)
25
27
{
26
28
  unsigned char *tmp;
56
58
        /* Write a key-page on disk */
57
59
 
58
60
int _mi_write_keypage(register MI_INFO *info, register MI_KEYDEF *keyinfo,
59
 
                      my_off_t page, int level, unsigned char *buff)
 
61
                      internal::my_off_t page, int level, unsigned char *buff)
60
62
{
61
63
  register uint32_t length;
62
64
 
90
92
 
91
93
        /* Remove page from disk */
92
94
 
93
 
int _mi_dispose(register MI_INFO *info, MI_KEYDEF *keyinfo, my_off_t pos,
 
95
int _mi_dispose(register MI_INFO *info, MI_KEYDEF *keyinfo, internal::my_off_t pos,
94
96
                int level)
95
97
{
96
 
  my_off_t old_link;
 
98
  internal::my_off_t old_link;
97
99
  unsigned char buff[8];
98
100
 
99
101
  old_link= info->s->state.key_del[keyinfo->block_size_index];
110
112
 
111
113
        /* Make new page on disk */
112
114
 
113
 
my_off_t _mi_new(register MI_INFO *info, MI_KEYDEF *keyinfo, int level)
 
115
internal::my_off_t _mi_new(register MI_INFO *info, MI_KEYDEF *keyinfo, int level)
114
116
{
115
 
  my_off_t pos;
 
117
  internal::my_off_t pos;
116
118
  unsigned char buff[8];
117
119
 
118
120
  if ((pos= info->s->state.key_del[keyinfo->block_size_index]) ==