← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/quick_ror_intersect_select.cc

  • Committer: Brian Aker
  • Date: 2010-04-19 17:51:52 UTC
  • Revision ID: brian@gaz-20100419175152-lar9fncw9vhhav0d
Updates to confine memroot

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/quick_ror_intersect_select.cc
54
54
  {
55
55
    memset(&alloc, 0, sizeof(memory::Root));
56
56
  }
57
 
  last_rowid= (unsigned char*) alloc_root(parent_alloc ? parent_alloc : &alloc,
58
 
                                          head->cursor->ref_length);
 
57
 
 
58
  if (parent_alloc)
 
59
  {
 
60
    last_rowid= (unsigned char*) parent_alloc->alloc_root(head->cursor->ref_length);
 
61
  }
 
62
  else
 
63
  {
 
64
    last_rowid= (unsigned char*) alloc.alloc_root(head->cursor->ref_length);
 
65
  }
59
66
}
60
67
 
61
68