← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

Merge Jay.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
40
40
#include "drizzled/internal/iocache.h"
41
41
#include "drizzled/internal/my_sys.h"
42
42
#include "plugin/myisam/myisam.h"
 
43
#include "drizzled/plugin/transactional_storage_engine.h"
43
44
 
44
45
using namespace std;
45
46
 
153
154
   Release InnoDB's adaptive hash index latch (if holding) before
154
155
   running a sort.
155
156
  */
156
 
  plugin::StorageEngine::releaseTemporaryLatches(session);
 
157
  plugin::TransactionalStorageEngine::releaseTemporaryLatches(session);
157
158
 
158
159
  /*
159
160
    Don't use table->sort in filesort as it is also used by