← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/hp_hash.cc

  • Committer: Brian Aker
  • Date: 2010-08-11 21:21:09 UTC
  • mfrom: (1697.2.5 staging)
  • Revision ID: brian@gaz-20100811212109-nsfakn1qtsvsgiax
Update heap (mostly C++).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/hp_hash.cc
61
61
                               key_range *max_key)
62
62
{
63
63
  ha_rows start_pos, end_pos;
64
 
  HP_KEYDEF *keyinfo= info->s->keydef + inx;
 
64
  HP_KEYDEF *keyinfo= info->getShare()->keydef + inx;
65
65
  TREE *rb_tree = &keyinfo->rb_tree;
66
66
  heap_rb_param custom_arg;
67
67
 
111
111
  register HASH_INFO *pos,*prev_ptr;
112
112
  int flag;
113
113
  uint32_t old_nextflag;
114
 
  HP_SHARE *share=info->s;
 
114
  HP_SHARE *share=info->getShare();
115
115
  old_nextflag=nextflag;
116
116
  flag=1;
117
117
  prev_ptr=0;
797
797
  uint64_t value= 0;                    /* Store unsigned values here */
798
798
  int64_t s_value= 0;                   /* Store signed values here */
799
799
 
800
 
  HA_KEYSEG *keyseg= info->s->keydef[info->s->auto_key - 1].seg;
 
800
  HA_KEYSEG *keyseg= info->getShare()->keydef[info->getShare()->auto_key - 1].seg;
801
801
  const unsigned char *key=  (unsigned char*) record + keyseg->start;
802
802
 
803
 
  switch (info->s->auto_key_type) {
 
803
  switch (info->getShare()->auto_key_type) {
804
804
  case HA_KEYTYPE_BINARY:
805
805
    value=(uint64_t)  *(unsigned char*) key;
806
806
    break;
838
838
    and if s_value == 0 then value will contain either s_value or the
839
839
    correct value.
840
840
  */
841
 
  set_if_bigger(info->s->auto_increment,
 
841
  set_if_bigger(info->getShare()->auto_increment,
842
842
                (s_value > 0) ? (uint64_t) s_value : value);
843
843
}