← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

Merged Eric from lp:~eday/drizzle/eday-merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
1195
1195
      select_describe(this, false, false, false, (zero_result_cause?zero_result_cause:"No tables used"));
1196
1196
    else
1197
1197
    {
1198
 
      result->send_fields(*columns_list, Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF);
 
1198
      result->send_fields(*columns_list);
1199
1199
      /*
1200
1200
        We have to test for 'conds' here as the WHERE may not be constant
1201
1201
        even if we don't have any tables for prepared statements or if
1642
1642
  curr_join->fields= curr_fields_list;
1643
1643
 
1644
1644
  session->set_proc_info("Sending data");
1645
 
  result->send_fields(*curr_fields_list,
1646
 
                      Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF);
 
1645
  result->send_fields(*curr_fields_list);
1647
1646
  error= do_select(curr_join, curr_fields_list, NULL);
1648
1647
  session->limit_found_rows= curr_join->send_records;
1649
1648
 
5199
5198
    if (having && having->val_int() == 0)
5200
5199
      send_row=0;
5201
5200
  }
5202
 
  if (!(result->send_fields(fields, Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF)))
 
5201
  if (!(result->send_fields(fields)))
5203
5202
  {
5204
5203
    if (send_row)
5205
5204
    {