← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/singular.cc

  • Committer: Mark Atwood
  • Date: 2011-06-22 20:04:22 UTC
  • mfrom: (2318.6.39 rf)
  • Revision ID: me@mark.atwood.name-20110622200422-609npl456o0e5p32
merge lp:~olafvdspek/drizzle/refactor13

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/singular.cc
87
87
  null_pack_length= (null_count + 7)/8;
88
88
  getMutableShare()->setRecordLength(record_length + null_pack_length);
89
89
  getMutableShare()->rec_buff_length= ALIGN_SIZE(getMutableShare()->getRecordLength() + 1);
90
 
  record[0]= (unsigned char*)session->getMemRoot()->allocate(getMutableShare()->rec_buff_length);
 
90
  record[0]= (unsigned char*)session->mem.alloc(getMutableShare()->rec_buff_length);
91
91
  if (not getInsertRecord())
92
92
  {
93
93
    throw "Memory allocation failure";
187
187
  {                                             // Get keys for ni_create
188
188
    bool using_unique_constraint= false;
189
189
    HA_KEYSEG *seg= (HA_KEYSEG*) getMemRoot()->alloc_root(sizeof(*seg) * keyinfo->key_parts);
190
 
    if (not seg)
191
 
      return true;
192
190
 
193
191
    memset(seg, 0, sizeof(*seg) * keyinfo->key_parts);
194
192
    if (keyinfo->key_length >= cursor->getEngine()->max_key_length() ||