← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/sum.cc

  • Committer: Lee Bieber
  • Date: 2011-02-18 23:49:00 UTC
  • mfrom: (2182.1.4 build)
  • Revision ID: kalebral@gmail.com-20110218234900-7zxzvw9x7e7zwflr
Merge Brian - add safe_delete()
Merge Stewart - 720552: doStartIndexScan return code ignored in optimizer::sum_query() for MIN() optimization 
Merge Olaf - add register keyword
Merge Patrick - 720813: syntax error in dbqp that is breaking it

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/sum.cc
266
266
                break;
267
267
              }
268
268
              error= table->cursor->startIndexScan(static_cast<uint32_t>(ref.key), 1);
 
269
              if (error)
 
270
              {
 
271
                if (table->key_read)
 
272
                {
 
273
                  table->key_read= 0;
 
274
                  table->cursor->extra(HA_EXTRA_NO_KEYREAD);
 
275
                }
 
276
                table->print_error(error, MYF(0));
 
277
                return error;
 
278
              }
269
279
 
270
280
              if (! ref.key_length)
271
281
              {