← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
121
121
                   uint64_t setup_tables_done_option)
122
122
{
123
123
  bool res;
124
 
  register Select_Lex *select_lex= &lex->select_lex;
 
124
  Select_Lex *select_lex= &lex->select_lex;
125
125
  DRIZZLE_SELECT_START(session->getQueryString()->c_str());
126
126
 
127
127
  if (select_lex->master_unit()->is_union() ||