← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_union.cc

  • Committer: Brian Aker
  • Date: 2010-05-18 23:58:31 UTC
  • mfrom: (1532.1.9 fix-table)
  • Revision ID: brian@gaz-20100518235831-nji9mm9ju2eekelw
Merge of overall patch for TableShare new() work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
127
127
  if (! (table= create_tmp_table(session_arg, &tmp_table_param, *column_types,
128
128
                                 (order_st*) NULL, is_union_distinct, 1,
129
129
                                 options, HA_POS_ERROR, (char*) table_alias)))
 
130
  {
130
131
    return true;
 
132
  }
 
133
 
131
134
  table->cursor->extra(HA_EXTRA_WRITE_CACHE);
132
135
  table->cursor->extra(HA_EXTRA_IGNORE_DUP_KEY);
 
136
 
133
137
  return false;
134
138
}
135
139
 
604
608
  {
605
609
    delete union_result;
606
610
    union_result=0; // Safety
607
 
    if (table)
608
 
      table->free_tmp_table(session);
609
611
    table= 0; // Safety
610
612
  }
611
613