← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Brian Aker
  • Date: 2009-02-18 19:27:32 UTC
  • mfrom: (873.1.17 temporal-new)
  • Revision ID: brian@tangent.org-20090218192732-ype4iscybtftjk2y
Merge Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
2047
2047
  error= 0;
2048
2048
 
2049
2049
  if (!tables_list && (tables || !select_lex->with_sum_func))
2050
 
  {                                           // Only test of functions
 
2050
  {                                           
 
2051
    /* Only test of functions */
2051
2052
    if (select_options & SELECT_DESCRIBE)
2052
2053
      select_describe(this, false, false, false,
2053
2054
                      (zero_result_cause?zero_result_cause:"No tables used"));
2064
2065
          (!conds || conds->val_int()) &&
2065
2066
          (!having || having->val_int()))
2066
2067
      {
2067
 
        if (do_send_rows && result->send_data(fields_list))
2068
 
          error= 1;
2069
 
        else
2070
 
        {
2071
 
          error= (int) result->send_eof();
2072
 
          send_records= ((select_options & OPTION_FOUND_ROWS) ? 1 :
2073
 
                         session->sent_row_count);
2074
 
        }
 
2068
        if (do_send_rows && result->send_data(fields_list))
 
2069
          error= 1;
 
2070
        else
 
2071
        {
 
2072
          error= (int) result->send_eof();
 
2073
          send_records= ((select_options & OPTION_FOUND_ROWS) ? 1 : session->sent_row_count);
 
2074
        }
2075
2075
      }
2076
2076
      else
2077
2077
      {
2078
 
        error=(int) result->send_eof();
 
2078
        error= (int) result->send_eof();
2079
2079
        send_records= 0;
2080
2080
      }
2081
2081
    }