← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_delete.cc

  • Committer: Lee Bieber
  • Date: 2010-11-05 20:22:41 UTC
  • mfrom: (1907.1.2 build)
  • Revision ID: kalebral@gmail.com-20101105202241-1fm31t0y0fvdwcd3
Merge Brian - Adding FileSort class, merge in catalog tree
Merge Joe - fix bug 670971: InnoDB does not complete shutdown with transaction log enabled

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_delete.cc
30
30
#include "drizzled/records.h"
31
31
#include "drizzled/internal/iocache.h"
32
32
#include "drizzled/transaction_services.h"
 
33
#include "drizzled/filesort.h"
33
34
 
34
35
namespace drizzled
35
36
{
204
205
 
205
206
    if (usable_index == MAX_KEY)
206
207
    {
 
208
      FileSort filesort(*session);
207
209
      table->sort.io_cache= new internal::IO_CACHE;
208
210
 
209
211
 
210
 
      if (!(sortorder= make_unireg_sortorder((Order*) order->first,
211
 
                                             &length, NULL)) ||
212
 
          (table->sort.found_records = filesort(session, table, sortorder, length,
213
 
                                                select, HA_POS_ERROR, 1,
214
 
                                                &examined_rows))
215
 
          == HA_POS_ERROR)
 
212
      if (not (sortorder= make_unireg_sortorder((Order*) order->first, &length, NULL)) ||
 
213
          (table->sort.found_records = filesort.run(table, sortorder, length,
 
214
                                                    select, HA_POS_ERROR, 1,
 
215
                                                    &examined_rows)) == HA_POS_ERROR)
216
216
      {
217
217
        delete select;
218
218
        free_underlaid_joins(session, &session->lex->select_lex);