← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/hp_rkey.cc

  • Committer: Brian Aker
  • Date: 2010-08-13 18:47:31 UTC
  • mfrom: (1707.1.7 rollup)
  • Revision ID: brian@tangent.org-20100813184731-w2iu1wzs219nqmt6
Style fixes/etc in heap.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/hp_rkey.cc
39
39
 
40
40
    custom_arg.keyseg= info->getShare()->keydef[inx].seg;
41
41
    custom_arg.key_length= info->lastkey_len=
42
 
      hp_rb_pack_key(keyinfo, (unsigned char*) info->lastkey,
 
42
      hp_rb_pack_key(keyinfo, &info->lastkey[0],
43
43
                     (unsigned char*) key, keypart_map);
44
44
    custom_arg.search_flag= SEARCH_FIND | SEARCH_SAME;
45
45
    /* for next rkey() after deletion */
50
50
    else
51
51
      info->last_find_flag= find_flag;
52
52
    if (!(pos= (unsigned char *)tree_search_key(&keyinfo->rb_tree,
53
 
                                                info->lastkey, info->parents,
 
53
                                                &info->lastkey[0], info->parents,
54
54
                                                &info->last_pos,
55
55
                                                find_flag, &custom_arg)))
56
56
    {
68
68
      return(errno);
69
69
    }
70
70
    if (!(keyinfo->flag & HA_NOSAME))
71
 
      memcpy(info->lastkey, key, (size_t) keyinfo->length);
 
71
      memcpy(&info->lastkey[0], key, (size_t) keyinfo->length);
72
72
  }
73
73
  hp_extract_record(share, record, pos);
74
74
  info->update= HA_STATE_AKTIV;