← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.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/sql_base.cc
2152
2152
    }
2153
2153
 
2154
2154
    /* make a new table */
2155
 
    table= (Table *) malloc(sizeof(*table));
 
2155
    table= new Table;
2156
2156
    if (table == NULL)
2157
2157
    {
2158
2158
      pthread_mutex_unlock(&LOCK_open);
3546
3546
      other_bitmap=   table->read_set;
3547
3547
    }
3548
3548
 
3549
 
    if (bitmap_fast_test_and_set(current_bitmap, field->field_index))
 
3549
    if (bitmap_test_and_set(current_bitmap, field->field_index))
3550
3550
    {
3551
3551
      if (session->mark_used_columns == MARK_COLUMNS_WRITE)
3552
3552
        session->dup_field= field;