← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_union.cc

  • Committer: Mark Atwood
  • Date: 2011-06-22 20:04:22 UTC
  • mfrom: (2318.6.39 rf)
  • Revision ID: me@mark.atwood.name-20110622200422-609npl456o0e5p32
merge lp:~olafvdspek/drizzle/refactor13

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
307
307
        field object without table.
308
308
      */
309
309
      assert(!empty_table);
310
 
      empty_table= (Table*) session->calloc(sizeof(Table));
 
310
      empty_table= (Table*) session->mem.calloc(sizeof(Table));
311
311
      types.clear();
312
312
      List<Item>::iterator it(sl->item_list.begin());
313
 
      Item *item_tmp;
314
 
      while ((item_tmp= it++))
 
313
      while (Item* item_tmp= it++)
315
314
      {
316
315
        /* Error's in 'new' will be detected after loop */
317
316
        types.push_back(new Item_type_holder(session_arg, item_tmp));