← 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-24 11:45:17 UTC
  • mfrom: (2318.6.64 rf)
  • Revision ID: me@mark.atwood.name-20110624114517-1mq8no6jlp2nrg7m
merge lp:~olafvdspek/drizzle/refactor15

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
35
35
                   Select_Lex_Unit *unit, uint64_t setup_tables_done_option)
36
36
{
37
37
  bool res= unit->prepare(session, result, SELECT_NO_UNLOCK | setup_tables_done_option);
38
 
  if (!res)
 
38
  if (not res)
39
39
    res= unit->exec();
40
40
  if (res)
41
 
    res|= unit->cleanup();
 
41
    unit->cleanup();
42
42
  return res;
43
43
}
44
44