← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/cursor.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-22 17:21:46 UTC
  • mto: This revision was merged to the branch mainline in revision 2347.
  • Revision ID: olafvdspek@gmail.com-20110622172146-fmtxxu9xt3ddmnm5
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/cursor.cc
89
89
    on this->table->mem_root and we will not be able to reclaim that memory
90
90
    when the clone Cursor object is destroyed.
91
91
  */
92
 
  new_handler->ref= (unsigned char*) mem_root->alloc(ALIGN_SIZE(ref_length)*2);
 
92
  new_handler->ref= mem_root->alloc(ALIGN_SIZE(ref_length)*2);
93
93
 
94
94
  identifier::Table identifier(getTable()->getShare()->getSchemaName(),
95
95
                             getTable()->getShare()->getTableName(),
249
249
 
250
250
    /* ref is already allocated for us if we're called from Cursor::clone() */
251
251
    if (!ref)
252
 
      ref= (unsigned char*) getTable()->alloc(ALIGN_SIZE(ref_length)*2);
 
252
      ref= getTable()->alloc(ALIGN_SIZE(ref_length)*2);
253
253
    dup_ref=ref+ALIGN_SIZE(ref_length);
254
254
  }
255
255
  return error;