← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

Merge of Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
124
124
{
125
125
  bool res;
126
126
  register Select_Lex *select_lex= &lex->select_lex;
127
 
  DRIZZLE_SELECT_START();
 
127
  DRIZZLE_SELECT_START(session->query);
128
128
 
129
129
  if (select_lex->master_unit()->is_union() ||
130
130
      select_lex->master_unit()->fake_select_lex)
157
157
  if (unlikely(res))
158
158
    result->abort();
159
159
 
160
 
  DRIZZLE_SELECT_END();
161
 
  return(res);
 
160
  DRIZZLE_SELECT_DONE(res, session->limit_found_rows);
 
161
  return res;
162
162
}
163
163
 
164
164
/*