← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/opt_range.cc

  • Committer: Brian Aker
  • Date: 2008-12-05 03:17:16 UTC
  • mfrom: (641.3.11 devel)
  • Revision ID: brian@tangent.org-20081205031716-r65xkzugjylmvv1h
Monty merge (a couple of alterations for malloc()).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/opt_range.cc
1117
1117
  save_write_set= head->write_set;
1118
1118
 
1119
1119
  /* Allocate a bitmap for used columns (Q: why not on MEM_ROOT?) */
1120
 
  if (!(bitmap= (my_bitmap_map*) my_malloc(head->s->column_bitmap_size,
1121
 
                                           MYF(MY_WME))))
 
1120
  if (!(bitmap= (my_bitmap_map*) malloc(head->s->column_bitmap_size)))
1122
1121
  {
1123
1122
    column_bitmap.bitmap= 0;
1124
1123
    *create_error= 1;