← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.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_update.cc
30
30
#include "drizzled/internal/my_sys.h"
31
31
#include "drizzled/internal/iocache.h"
32
32
#include "drizzled/transaction_services.h"
 
33
#include "drizzled/filesort.h"
33
34
 
34
35
#include <boost/dynamic_bitset.hpp>
35
36
#include <list>
313
314
      uint32_t         length= 0;
314
315
      SortField  *sortorder;
315
316
      ha_rows examined_rows;
 
317
      FileSort filesort(*session);
316
318
 
317
 
      table->sort.io_cache = new internal::IO_CACHE;
 
319
      table->sort.io_cache= new internal::IO_CACHE;
318
320
 
319
321
      if (!(sortorder=make_unireg_sortorder(order, &length, NULL)) ||
320
 
          (table->sort.found_records= filesort(session, table, sortorder, length,
321
 
                                               select, limit, 1,
322
 
                                               &examined_rows))
 
322
          (table->sort.found_records= filesort.run(table, sortorder, length,
 
323
                                                   select, limit, 1,
 
324
                                                   &examined_rows))
323
325
          == HA_POS_ERROR)
324
326
      {
325
327
        goto err;