~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.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:
3009
3009
      if (!(bitmaps= (unsigned char*) alloc_root(session->mem_root, bitmap_size)))
3010
3010
        return(0);
3011
3011
      bitmap_init(&show_table->def_read_set,
3012
 
                  (my_bitmap_map*) bitmaps, show_table_share->fields, false);
 
3012
                  (my_bitmap_map*) bitmaps, show_table_share->fields);
3013
3013
      bitmap_set_all(&show_table->def_read_set);
3014
3014
      show_table->read_set= &show_table->def_read_set;
3015
3015
    }
3784
3784
    return(0);
3785
3785
  my_bitmap_map* bitmaps=
3786
3786
    (my_bitmap_map*) session->alloc(bitmap_buffer_size(field_count));
3787
 
  bitmap_init(&table->def_read_set, (my_bitmap_map*) bitmaps, field_count,
3788
 
              false);
 
3787
  bitmap_init(&table->def_read_set, (my_bitmap_map*) bitmaps, field_count);
3789
3788
  table->read_set= &table->def_read_set;
3790
3789
  bitmap_clear_all(table->read_set);
3791
3790
  table_list->schema_table_param= tmp_table_param;