← 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-24 02:13:02 UTC
  • mfrom: (2318.6.56 rf)
  • Revision ID: me@mark.atwood.name-20110624021302-y9oiksid220xan9s
merge lp:~olafvdspek/drizzle/refactor14

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->mem.alloc(getMutableShare()->rec_buff_length);
 
90
  record[0]= session->mem.alloc(getMutableShare()->rec_buff_length);
91
91
  if (not getInsertRecord())
92
92
  {
93
93
    throw "Memory allocation failure";
186
186
  if (getShare()->sizeKeys())
187
187
  {                                             // Get keys for ni_create
188
188
    bool using_unique_constraint= false;
189
 
    HA_KEYSEG *seg= (HA_KEYSEG*) getMemRoot()->alloc_root(sizeof(*seg) * keyinfo->key_parts);
 
189
    HA_KEYSEG *seg= (HA_KEYSEG*) getMemRoot().alloc(sizeof(*seg) * keyinfo->key_parts);
190
190
 
191
191
    memset(seg, 0, sizeof(*seg) * keyinfo->key_parts);
192
192
    if (keyinfo->key_length >= cursor->getEngine()->max_key_length() ||
321
321
  }
322
322
 
323
323
  /* free blobs */
324
 
  for (Field **ptr= getFields() ; *ptr ; ptr++)
 
324
  for (Field **ptr= getFields(); *ptr; ptr++)
325
325
  {
326
326
    (*ptr)->free();
327
327
  }
328
328
  free_io_cache();
329
329
 
330
 
  getMemRoot()->free_root(MYF(0));
 
330
  getMemRoot().free_root(MYF(0));
331
331
  in_use->set_proc_info(save_proc_info);
332
332
}
333
333