← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_union.cc

  • Committer: Monty Taylor
  • Date: 2008-08-18 23:04:17 UTC
  • mfrom: (327.1.12 drizzle)
  • Revision ID: monty@inaugust.com-20080818230417-442rhihpahnout34
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
194
194
  SELECT_LEX *sl, *first_sl= first_select();
195
195
  select_result *tmp_result;
196
196
  bool is_union_select;
197
 
  TABLE *empty_table= 0;
 
197
  Table *empty_table= 0;
198
198
 
199
199
  describe= test(additional_options & SELECT_DESCRIBE);
200
200
 
300
300
        field object without table.
301
301
      */
302
302
      assert(!empty_table);
303
 
      empty_table= (TABLE*) thd->calloc(sizeof(TABLE));
 
303
      empty_table= (Table*) thd->calloc(sizeof(Table));
304
304
      types.empty();
305
305
      List_iterator_fast<Item> it(sl->item_list);
306
306
      Item *item_tmp;
612
612
    delete union_result;
613
613
    union_result=0; // Safety
614
614
    if (table)
615
 
      free_tmp_table(thd, table);
 
615
      table->free_tmp_table(thd);
616
616
    table= 0; // Safety
617
617
  }
618
618