← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/opt_range.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-04-17 02:13:52 UTC
  • mto: (997.2.4 mordred)
  • mto: This revision was merged to the branch mainline in revision 1003.
  • Revision ID: osullivan.padraig@gmail.com-20090417021352-r3xcs9iz8j9zuwbf
Removed my_bitmap.[cc,h] files from the mysys directory. Also removed them
from the Makefile.am file. Some more minor modifications to a number of
files due to the type of key_map now being std::bitset.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/opt_range.cc
2756
2756
ROR_SCAN_INFO *make_ror_scan(const PARAM *param, int idx, SEL_ARG *sel_arg)
2757
2757
{
2758
2758
  ROR_SCAN_INFO *ror_scan;
2759
 
  my_bitmap_map *bitmap_buf;
2760
2759
  uint32_t keynr;
2761
2760
 
2762
2761
  if (!(ror_scan= (ROR_SCAN_INFO*)alloc_root(param->mem_root,
2769
2768
                             param->table->file->ref_length);
2770
2769
  ror_scan->sel_arg= sel_arg;
2771
2770
  ror_scan->records= param->table->quick_rows[keynr];
2772
 
 
2773
 
  if (!(bitmap_buf= (my_bitmap_map*) alloc_root(param->mem_root,
2774
 
                                                param->fields_bitmap_size)))
2775
 
    return NULL;
2776
 
 
2777
2771
  ror_scan->covered_fields.reset();
2778
2772
 
2779
2773
  KEY_PART_INFO *key_part= param->table->key_info[keynr].key_part;
6315
6309
    param->table->quick_rows[keynr]=rows;
6316
6310
    if (update_tbl_stats)
6317
6311
    {
6318
 
      param->table->quick_keys.set_bit(keynr);
 
6312
      param->table->quick_keys.set(keynr);
6319
6313
      param->table->quick_key_parts[keynr]=param->max_key_part+1;
6320
6314
      param->table->quick_n_ranges[keynr]= param->range_count;
6321
6315
      param->table->quick_condition_rows=