← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_union.cc

Merged fix-warnings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
24
24
#include <drizzled/sql_base.h>
25
25
 
26
26
bool mysql_union(Session *session, LEX *, select_result *result,
27
 
                 Select_Lex_Unit *unit, ulong setup_tables_done_option)
 
27
                 Select_Lex_Unit *unit, uint64_t setup_tables_done_option)
28
28
{
29
29
  bool res;
30
30
  if (!(res= unit->prepare(session, result, SELECT_NO_UNLOCK |
186
186
 
187
187
 
188
188
bool Select_Lex_Unit::prepare(Session *session_arg, select_result *sel_result,
189
 
                                 uint32_t additional_options)
 
189
                              uint64_t additional_options)
190
190
{
191
191
  Select_Lex *lex_select_save= session_arg->lex->current_select;
192
192
  Select_Lex *sl, *first_sl= first_select();