← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_union.cc

  • Committer: Lee Bieber
  • Date: 2011-03-23 23:16:25 UTC
  • mfrom: (2247.1.2 build)
  • Revision ID: kalebral@gmail.com-20110323231625-61k77qbh7n1iu776
Merge Olaf - Use BOOST_FOREACH
Merge Olaf - Remove std::nothrow from new()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
372
372
    result_table_list.table= table= union_result->table;
373
373
 
374
374
    session_arg->lex().current_select= lex_select_save;
375
 
    if (!item_list.size())
376
 
    {
377
 
      saved_error= table->fill_item_list(&item_list);
378
 
      if (saved_error)
379
 
        goto err;
380
 
    }
 
375
    if (item_list.is_empty())
 
376
      table->fill_item_list(item_list);
381
377
    else
382
378
    {
383
379
      /*
384
380
        We're in execution of a prepared statement or stored procedure:
385
381
        reset field items to point at fields from the created temporary table.
386
382
      */
387
 
      assert(1);
 
383
      assert(1); // Olaf: should this be assert(false)?
388
384
    }
389
385
  }
390
386