← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/opt_range.cc

  • Committer: Monty Taylor
  • Date: 2009-05-24 23:54:21 UTC
  • mfrom: (1014.2.12 kill-malloc)
  • mto: This revision was merged to the branch mainline in revision 1039.
  • Revision ID: mordred@inaugust.com-20090524235421-x5vfss90auzbn896
Merged Monty from lp:~mordred/drizzle/kill-malloc

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/opt_range.cc
1128
1128
    *create_error= 1;
1129
1129
  }
1130
1130
  else
1131
 
    bitmap_init(&column_bitmap, bitmap, head->s->fields, false);
 
1131
    bitmap_init(&column_bitmap, bitmap, head->s->fields);
1132
1132
  return;
1133
1133
}
1134
1134
 
2103
2103
  param->fields_bitmap_size= table->s->column_bitmap_size;
2104
2104
  if (!(tmp= (my_bitmap_map*) alloc_root(param->mem_root,
2105
2105
                                  param->fields_bitmap_size)) ||
2106
 
      bitmap_init(&param->needed_fields, tmp, table->s->fields, false))
 
2106
      bitmap_init(&param->needed_fields, tmp, table->s->fields))
2107
2107
    return 1;
2108
2108
 
2109
2109
  bitmap_copy(&param->needed_fields, table->read_set);
2793
2793
    return NULL;
2794
2794
 
2795
2795
  if (bitmap_init(&ror_scan->covered_fields, bitmap_buf,
2796
 
                  param->table->s->fields, false))
 
2796
                  param->table->s->fields))
2797
2797
    return NULL;
2798
2798
  bitmap_clear_all(&ror_scan->covered_fields);
2799
2799
 
2911
2911
  if (!(buf= (my_bitmap_map*) alloc_root(param->mem_root,
2912
2912
                                         param->fields_bitmap_size)))
2913
2913
    return NULL;
2914
 
  if (bitmap_init(&info->covered_fields, buf, param->table->s->fields,
2915
 
                  false))
 
2914
  if (bitmap_init(&info->covered_fields, buf, param->table->s->fields))
2916
2915
    return NULL;
2917
2916
  info->is_covering= false;
2918
2917
  info->index_scan_costs= 0.0;
3458
3457
                                               param->fields_bitmap_size);
3459
3458
  if (!covered_fields->bitmap ||
3460
3459
      bitmap_init(covered_fields, covered_fields->bitmap,
3461
 
                  param->table->s->fields, false))
 
3460
                  param->table->s->fields))
3462
3461
    return 0;
3463
3462
  bitmap_clear_all(covered_fields);
3464
3463