← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_table.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/statement/alter_table.cc
44
44
 
45
45
#include "drizzled/transaction_services.h"
46
46
 
 
47
#include "drizzled/filesort.h"
 
48
 
47
49
#include "drizzled/message.h"
48
50
 
49
51
using namespace std;
1494
1496
    }
1495
1497
    else
1496
1498
    {
 
1499
      FileSort filesort(*session);
1497
1500
      from->sort.io_cache= new internal::IO_CACHE;
1498
1501
 
1499
1502
      memset(&tables, 0, sizeof(tables));
1507
1510
          setup_order(session, session->lex->select_lex.ref_pointer_array,
1508
1511
                      &tables, fields, all_fields, order) ||
1509
1512
          !(sortorder= make_unireg_sortorder(order, &length, NULL)) ||
1510
 
          (from->sort.found_records= filesort(session, from, sortorder, length,
1511
 
                                              (optimizer::SqlSelect *) 0, HA_POS_ERROR,
1512
 
                                              1, &examined_rows)) ==
1513
 
          HA_POS_ERROR)
 
1513
          (from->sort.found_records= filesort.run(from, sortorder, length,
 
1514
                                                  (optimizer::SqlSelect *) 0, HA_POS_ERROR,
 
1515
                                                  1, &examined_rows)) == HA_POS_ERROR)
1514
1516
      {
1515
1517
        goto err;
1516
1518
      }