← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/quick_range_select.cc

  • Committer: Monty Taylor
  • Date: 2009-12-27 00:49:03 UTC
  • mto: This revision was merged to the branch mainline in revision 1255.
  • Revision ID: mordred@inaugust.com-20091227004903-maw7ktxu6i6hye9b
Moved mem_root functions into drizzled::memory:: namespace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/quick_range_select.cc
69
69
  if (! no_alloc && ! parent_alloc)
70
70
  {
71
71
    // Allocates everything through the internal memroot
72
 
    init_sql_alloc(&alloc, session->variables.range_alloc_block_size, 0);
 
72
    memory::init_sql_alloc(&alloc, session->variables.range_alloc_block_size, 0);
73
73
    session->mem_root= &alloc;
74
74
  }
75
75
  else
82
82
  save_read_set= head->read_set;
83
83
  save_write_set= head->write_set;
84
84
 
85
 
  /* Allocate a bitmap for used columns. Using sql_alloc instead of malloc
 
85
  /* Allocate a bitmap for used columns. Using memory::sql_alloc instead of malloc
86
86
     simply as a "fix" to the MySQL 6.0 code that also free()s it at the
87
87
     same time we destroy the mem_root.
88
88
   */
89
89
 
90
 
  bitmap= reinterpret_cast<my_bitmap_map*>(sql_alloc(head->s->column_bitmap_size));
 
90
  bitmap= reinterpret_cast<my_bitmap_map*>(memory::sql_alloc(head->s->column_bitmap_size));
91
91
  if (! bitmap)
92
92
  {
93
93
    column_bitmap.setBitmap(NULL);