← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/range.cc

  • Committer: Brian Aker
  • Date: 2010-04-19 19:23:14 UTC
  • Revision ID: brian@gaz-20100419192314-47vro57tcn607i61
More updates for memory::Root

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/range.cc
686
686
        fill_used_fields_bitmap(&param))
687
687
    {
688
688
      session->no_errors=0;
689
 
      free_root(&alloc,MYF(0));                 // Return memory & allocator
 
689
      alloc.free_root(MYF(0));                  // Return memory & allocator
 
690
 
690
691
      return 0;                         // Can't use range
691
692
    }
692
693
    key_parts= param.key_parts;
849
850
    }
850
851
 
851
852
  free_mem:
852
 
    free_root(&alloc,MYF(0));                   // Return memory & allocator
 
853
    alloc.free_root(MYF(0));                    // Return memory & allocator
853
854
    session->mem_root= param.old_root;
854
855
    session->no_errors=0;
855
856
  }
3841
3842
    {
3842
3843
      quick->mrr_flags= mrr_flags;
3843
3844
      quick->mrr_buf_size= mrr_buf_size;
3844
 
      quick->key_parts=(KEY_PART*)
3845
 
        memdup_root(parent_alloc? parent_alloc : &quick->alloc,
3846
 
                    (char*) param->key[idx],
3847
 
                    sizeof(KEY_PART)*
3848
 
                    param->table->key_info[param->real_keynr[idx]].key_parts);
 
3845
      if (parent_alloc)
 
3846
      {
 
3847
        quick->key_parts=(KEY_PART*)
 
3848
          parent_alloc->memdup_root( (char*) param->key[idx], sizeof(KEY_PART)* param->table->key_info[param->real_keynr[idx]].key_parts);
 
3849
      }
 
3850
      else
 
3851
      {
 
3852
        quick->key_parts=(KEY_PART*)
 
3853
          quick->alloc.memdup_root((char*) param->key[idx], sizeof(KEY_PART)* param->table->key_info[param->real_keynr[idx]].key_parts);
 
3854
      }
3849
3855
    }
3850
3856
  }
3851
3857
  return quick;