← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-05 22:41:24 UTC
  • mto: (2318.2.9 rf)
  • mto: This revision was merged to the branch mainline in revision 2333.
  • Revision ID: olafvdspek@gmail.com-20110605224124-2i0s33fnhc9c2rpw
Return void

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
5292
5292
    if (having && having->val_int() == 0)
5293
5293
      send_row=0;
5294
5294
  }
5295
 
  if (! (result->send_fields(fields)))
 
5295
  result->send_fields(fields);
 
5296
  if (send_row)
5296
5297
  {
5297
 
    if (send_row)
5298
 
    {
5299
 
      List<Item>::iterator it(fields.begin());
5300
 
      Item *item;
5301
 
      while ((item= it++))
5302
 
        item->no_rows_in_result();
5303
 
      result->send_data(fields);
5304
 
    }
5305
 
    result->send_eof();                         // Should be safe
 
5298
    List<Item>::iterator it(fields.begin());
 
5299
    Item *item;
 
5300
    while ((item= it++))
 
5301
      item->no_rows_in_result();
 
5302
    result->send_data(fields);
5306
5303
  }
 
5304
  result->send_eof();                           // Should be safe
5307
5305
  /* Update results for FOUND_ROWS */
5308
5306
  join->session->limit_found_rows= join->session->examined_row_count= 0;
5309
5307
  return(0);