← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/hp_rkey.cc

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/hp_rkey.cc
23
23
              key_part_map keypart_map, enum ha_rkey_function find_flag)
24
24
{
25
25
  unsigned char *pos;
26
 
  HP_SHARE *share= info->s;
 
26
  HP_SHARE *share= info->getShare();
27
27
  HP_KEYDEF *keyinfo= share->keydef + inx;
28
28
 
29
29
  if ((uint) inx >= share->keys)
37
37
  {
38
38
    heap_rb_param custom_arg;
39
39
 
40
 
    custom_arg.keyseg= info->s->keydef[inx].seg;
 
40
    custom_arg.keyseg= info->getShare()->keydef[inx].seg;
41
41
    custom_arg.key_length= info->lastkey_len=
42
42
      hp_rb_pack_key(keyinfo, (unsigned char*) info->lastkey,
43
43
                     (unsigned char*) key, keypart_map);
80
80
 
81
81
unsigned char* heap_find(HP_INFO *info, int inx, const unsigned char *key)
82
82
{
83
 
  return hp_search(info, info->s->keydef + inx, key, 0);
 
83
  return hp_search(info, info->getShare()->keydef + inx, key, 0);
84
84
}