← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Monty Taylor
  • Date: 2009-02-02 20:06:06 UTC
  • mfrom: (822 drizzle)
  • mto: (779.7.3 devel)
  • mto: This revision was merged to the branch mainline in revision 823.
  • Revision ID: mordred@inaugust.com-20090202200606-mn858pzni1hrxy1a
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
2043
2043
 
2044
2044
  session->set_proc_info("executing");
2045
2045
  error= 0;
2046
 
  (void) result->prepare2(); // Currently, this cannot fail.
2047
2046
 
2048
2047
  if (!tables_list && (tables || !select_lex->with_sum_func))
2049
2048
  {                                           // Only test of functions
16570
16569
bool JOIN::change_result(select_result *res)
16571
16570
{
16572
16571
  result= res;
16573
 
  if (result->prepare(fields_list, select_lex->master_unit()) ||
16574
 
                     result->prepare2())
 
16572
  if (result->prepare(fields_list, select_lex->master_unit()))
16575
16573
  {
16576
16574
    return(true);
16577
16575
  }