← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/hp_write.cc

Updated an include guard thanks to a nice catch during code review from Jay. Thanks Jay!

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/hp_write.cc
25
25
#define HIGHFIND 4
26
26
#define HIGHUSED 8
27
27
 
28
 
using namespace drizzled;
29
 
 
30
28
static HASH_INFO *hp_find_free_hash(HP_SHARE *info, HP_BLOCK *block,
31
29
                                     uint32_t records);
32
30
 
40
38
  if ((share->records >= share->max_records && share->max_records) ||
41
39
    (share->recordspace.total_data_length + share->index_length >= share->max_table_size))
42
40
  {
43
 
    return(errno=HA_ERR_RECORD_FILE_FULL);
 
41
    return(my_errno=HA_ERR_RECORD_FILE_FULL);
44
42
  }
45
43
 
46
44
  rec_length = hp_get_encoded_data_length(share, record, &chunk_count);
47
45
 
48
46
  if (!(pos=hp_allocate_chunkset(&share->recordspace, chunk_count)))
49
 
    return(errno);
 
47
    return(my_errno);
50
48
  share->changed=1;
51
49
 
52
50
  for (keydef = share->keydef, end = keydef + share->keys; keydef < end;
76
74
    either.  Otherwise for HASH index on HA_ERR_FOUND_DUPP_KEY the key
77
75
    was inserted and we have to delete it.
78
76
  */
79
 
  if (keydef->algorithm == HA_KEY_ALG_BTREE || errno == ENOMEM)
 
77
  if (keydef->algorithm == HA_KEY_ALG_BTREE || my_errno == ENOMEM)
80
78
  {
81
79
    keydef--;
82
80
  }
89
87
 
90
88
  hp_free_chunks(&share->recordspace, pos);
91
89
 
92
 
  return(errno);
 
90
  return(my_errno);
93
91
} /* heap_write */
94
92
 
95
93
/*
118
116
  if (!tree_insert(&keyinfo->rb_tree, (void*)info->recbuf,
119
117
                   custom_arg.key_length, &custom_arg))
120
118
  {
121
 
    errno= HA_ERR_FOUND_DUPP_KEY;
 
119
    my_errno= HA_ERR_FOUND_DUPP_KEY;
122
120
    return 1;
123
121
  }
124
122
  info->s->index_length+= (keyinfo->rb_tree.allocated-old_allocated);
332
330
      {
333
331
        if (! hp_rec_key_cmp(keyinfo, record, pos->ptr_to_rec, 1))
334
332
        {
335
 
          return(errno=HA_ERR_FOUND_DUPP_KEY);
 
333
          return(my_errno=HA_ERR_FOUND_DUPP_KEY);
336
334
        }
337
335
      } while ((pos=pos->next_key));
338
336
    }