← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/hp_write.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_write.cc
34
34
{
35
35
  HP_KEYDEF *keydef, *end;
36
36
  unsigned char *pos;
37
 
  HP_SHARE *share=info->s;
 
37
  HP_SHARE *share=info->getShare();
38
38
  uint32_t rec_length, chunk_count;
39
39
 
40
40
  if ((share->records >= share->max_records && share->max_records) ||
121
121
    errno= HA_ERR_FOUND_DUPP_KEY;
122
122
    return 1;
123
123
  }
124
 
  info->s->index_length+= (keyinfo->rb_tree.allocated-old_allocated);
 
124
  info->getShare()->index_length+= (keyinfo->rb_tree.allocated-old_allocated);
125
125
  return 0;
126
126
}
127
127
 
153
153
int hp_write_key(HP_INFO *info, HP_KEYDEF *keyinfo,
154
154
                 const unsigned char *record, unsigned char *recpos)
155
155
{
156
 
  HP_SHARE *share = info->s;
 
156
  HP_SHARE *share = info->getShare();
157
157
  int flag;
158
158
  uint32_t halfbuff,hashnr,first_index;
159
159
  unsigned char *ptr_to_rec= NULL,*ptr_to_rec2= NULL;