← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_page.cc

  • Committer: Monty Taylor
  • Date: 2009-12-15 19:19:16 UTC
  • mto: (1241.14.1 out-of-tree)
  • mto: This revision was merged to the branch mainline in revision 1250.
  • Revision ID: mordred@inaugust.com-20091215191916-8wz3s0eojmkpzuy4
Put my_off_t back... but this time localized only to myisam and mysys.

Show diffs side-by-side

added added

removed removed

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