← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/range.cc

  • Committer: Mark Atwood
  • Date: 2011-04-29 00:19:38 UTC
  • mto: This revision was merged to the branch mainline in revision 2297.
  • Revision ID: me@mark.atwood.name-20110429001938-ps5i74hzcic7dvr3
Merge in Fixes of Brian's IOCACHE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/range.cc
366
366
 
367
367
  if (head->sort.io_cache)
368
368
  {
369
 
    memcpy(select->file, head->sort.io_cache, sizeof(internal::IO_CACHE));
 
369
    memcpy(select->file, head->sort.io_cache, sizeof(internal::io_cache_st));
370
370
    select->records=(ha_rows) (select->file->end_of_file/
371
371
                               head->cursor->ref_length);
372
372
    delete head->sort.io_cache;
380
380
  :
381
381
    quick(NULL),
382
382
    cond(NULL),
383
 
    file(static_cast<internal::IO_CACHE *>(memory::sql_calloc(sizeof(internal::IO_CACHE)))),
 
383
    file(static_cast<internal::io_cache_st *>(memory::sql_calloc(sizeof(internal::io_cache_st)))),
384
384
    free_cond(false)
385
385
{
386
386
  quick_keys.reset();