← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_page.c

Renamed strings to mystrings, for include/lib naming consistency.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_page.c
19
19
 
20
20
        /* Fetch a key-page in memory */
21
21
 
22
 
unsigned char *_mi_fetch_keypage(register MI_INFO *info, MI_KEYDEF *keyinfo,
 
22
uchar *_mi_fetch_keypage(register MI_INFO *info, MI_KEYDEF *keyinfo,
23
23
                         my_off_t page, int level, 
24
 
                         unsigned char *buff, int return_buffer)
 
24
                         uchar *buff, int return_buffer)
25
25
{
26
 
  unsigned char *tmp;
27
 
  uint32_t page_size;
 
26
  uchar *tmp;
 
27
  uint page_size;
28
28
 
29
 
  tmp=(unsigned char*) key_cache_read(info->s->key_cache,
30
 
                             info->s->kfile, page, level, (unsigned char*) buff,
 
29
  tmp=(uchar*) key_cache_read(info->s->key_cache,
 
30
                             info->s->kfile, page, level, (uchar*) buff,
31
31
                             (uint) keyinfo->block_length,
32
32
                             (uint) keyinfo->block_length,
33
33
                             return_buffer);
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
 
                      my_off_t page, int level, unsigned char *buff)
 
59
                      my_off_t page, int level, uchar *buff)
60
60
{
61
 
  register uint32_t length;
 
61
  register uint length;
62
62
 
63
63
#ifndef FAST                                    /* Safety check */
64
64
  if (page < info->s->base.keystart ||
76
76
#ifdef HAVE_purify
77
77
  {
78
78
    length=mi_getint(buff);
79
 
    memset(buff+length, 0, keyinfo->block_length-length);
 
79
    bzero((uchar*) buff+length,keyinfo->block_length-length);
80
80
    length=keyinfo->block_length;
81
81
  }
82
82
#endif
83
83
  return((key_cache_write(info->s->key_cache,
84
 
                         info->s->kfile,page, level, (unsigned char*) buff,length,
 
84
                         info->s->kfile,page, level, (uchar*) buff,length,
85
85
                         (uint) keyinfo->block_length,
86
86
                         (int) ((info->lock_type != F_UNLCK) ||
87
87
                                info->s->delay_key_write))));
94
94
                int level)
95
95
{
96
96
  my_off_t old_link;
97
 
  unsigned char buff[8];
 
97
  uchar buff[8];
98
98
 
99
99
  old_link= info->s->state.key_del[keyinfo->block_size_index];
100
100
  info->s->state.key_del[keyinfo->block_size_index]= pos;
113
113
my_off_t _mi_new(register MI_INFO *info, MI_KEYDEF *keyinfo, int level)
114
114
{
115
115
  my_off_t pos;
116
 
  unsigned char buff[8];
 
116
  uchar buff[8];
117
117
 
118
118
  if ((pos= info->s->state.key_del[keyinfo->block_size_index]) ==
119
119
      HA_OFFSET_ERROR)