← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_preload.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_preload.cc
21
21
#include <stdlib.h>
22
22
#include <drizzled/util/test.h>
23
23
 
24
 
 
 
24
using namespace drizzled;
25
25
 
26
26
/*
27
27
  Preload pages of the index file for a table into the key cache
49
49
  MYISAM_SHARE* share= info->s;
50
50
  uint32_t keys= share->state.header.keys;
51
51
  MI_KEYDEF *keyinfo= share->keyinfo;
52
 
  my_off_t key_file_length= share->state.state.key_file_length;
53
 
  my_off_t pos= share->base.keystart;
 
52
  internal::my_off_t key_file_length= share->state.state.key_file_length;
 
53
  internal::my_off_t pos= share->base.keystart;
54
54
 
55
55
  if (!keys || !mi_is_any_key_active(key_map) || key_file_length == pos)
56
56
    return(0);
81
81
  do
82
82
  {
83
83
    /* Read the next block of index file into the preload buffer */
84
 
    if ((my_off_t) length > (key_file_length-pos))
 
84
    if ((internal::my_off_t) length > (key_file_length-pos))
85
85
      length= (uint32_t) (key_file_length-pos);
86
86
    if (my_pread(share->kfile, (unsigned char*) buff, length, pos, MYF(MY_FAE|MY_FNABP)))
87
87
      goto err;