← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Brian Aker
  • Date: 2009-05-26 02:54:31 UTC
  • mfrom: (1022.2.34 mordred)
  • Revision ID: brian@gaz-20090526025431-hpjmsrr4j6nftuic
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
2150
2150
    }
2151
2151
 
2152
2152
    /* make a new table */
2153
 
    table= (Table *) malloc(sizeof(*table));
 
2153
    table= new Table;
2154
2154
    if (table == NULL)
2155
2155
    {
2156
2156
      pthread_mutex_unlock(&LOCK_open);
3543
3543
      other_bitmap=   table->read_set;
3544
3544
    }
3545
3545
 
3546
 
    if (bitmap_fast_test_and_set(current_bitmap, field->field_index))
 
3546
    if (bitmap_test_and_set(current_bitmap, field->field_index))
3547
3547
    {
3548
3548
      if (session->mark_used_columns == MARK_COLUMNS_WRITE)
3549
3549
        session->dup_field= field;