← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Lee Bieber
  • Date: 2011-01-19 01:50:26 UTC
  • mfrom: (2095.1.5 build)
  • Revision ID: kalebral@gmail.com-20110119015026-j1ukv30cz662e51e
Merge Shrews - Refactor the TransactionServices public interface
Merge Monty - fix bug 583375: support configure option to specify static/dynamic build for a plugin
Merge Shrews - fix bug 702505: transaction_reader utility does not check for errors from statement transformation
Merge Vijay - Convert structs to classes
Merge Joe - 702529: PRINT_TRANSACTION_MESSAGE udf does not output UUID

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
3932
3932
              error=join->result->send_data(*join->fields) ? 1 : 0;
3933
3933
            join->send_records++;
3934
3934
          }
3935
 
          if (join->rollup.state != ROLLUP::STATE_NONE && error <= 0)
 
3935
          if (join->rollup.getState() != Rollup::STATE_NONE && error <= 0)
3936
3936
          {
3937
3937
            if (join->rollup_send_data((uint32_t) (idx+1)))
3938
3938
              error= 1;
4022
4022
            return NESTED_LOOP_ERROR;
4023
4023
          }
4024
4024
        }
4025
 
        if (join->rollup.state != ROLLUP::STATE_NONE)
 
4025
        if (join->rollup.getState() != Rollup::STATE_NONE)
4026
4026
        {
4027
4027
          if (join->rollup_write_data((uint32_t) (idx+1), table))
4028
4028
            return NESTED_LOOP_ERROR;