← 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: 2011-02-18 16:48:57 UTC
  • mfrom: (2180.1.3 drizzle-staging)
  • Revision ID: brian@tangent.org-20110218164857-4n61en8wai9c91gi
Rollup all of Olaf's branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
307
307
      */
308
308
      assert(!empty_table);
309
309
      empty_table= (Table*) session->calloc(sizeof(Table));
310
 
      types.empty();
 
310
      types.clear();
311
311
      List_iterator_fast<Item> it(sl->item_list);
312
312
      Item *item_tmp;
313
313
      while ((item_tmp= it++))
531
531
        if (!(fake_select_lex->join= new Join(session, item_list,
532
532
                                              fake_select_lex->options, result)))
533
533
        {
534
 
          fake_select_lex->table_list.empty();
 
534
          fake_select_lex->table_list.clear();
535
535
          return(true);
536
536
        }
537
537
        fake_select_lex->join->no_const_tables= true;
581
581
        }
582
582
      }
583
583
 
584
 
      fake_select_lex->table_list.empty();
 
584
      fake_select_lex->table_list.clear();
585
585
      if (!saved_error)
586
586
      {
587
587
        session->limit_found_rows = (uint64_t)table->cursor->stats.records + add_rows;
721
721
  {
722
722
    error= (bool) ((uint32_t) error | (uint32_t) lex_unit->cleanup());
723
723
  }
724
 
  non_agg_fields.empty();
725
 
  inner_refs_list.empty();
 
724
  non_agg_fields.clear();
 
725
  inner_refs_list.clear();
726
726
  return(error);
727
727
}
728
728