← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Stewart Smith
  • Date: 2010-02-15 01:56:32 UTC
  • mto: (1273.13.96 build)
  • mto: This revision was merged to the branch mainline in revision 1308.
  • Revision ID: stewart@flamingspork.com-20100215015632-pm7lnxfq5j5uh8kj
move DATABASE() to function plugin. modify parser so that it looks for a function named 'database' when DATABASE() is called. Special case still needed in parser due to hilarity of not-really-reserved words.

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"
44
43
 
45
44
using namespace std;
46
45
 
148
147
  TableList *tab= table->pos_in_table_list;
149
148
  Item_subselect *subselect= tab ? tab->containing_subselect() : 0;
150
149
 
151
 
  DRIZZLE_FILESORT_START(table->s->getSchemaName(), table->s->getTableName());
 
150
  DRIZZLE_FILESORT_START(table->s->db.str, table->s->table_name.str);
152
151
 
153
152
  /*
154
153
   Release InnoDB's adaptive hash index latch (if holding) before
155
154
   running a sort.
156
155
  */
157
 
  plugin::TransactionalStorageEngine::releaseTemporaryLatches(session);
 
156
  plugin::StorageEngine::releaseTemporaryLatches(session);
158
157
 
159
158
  /*
160
159
    Don't use table->sort in filesort as it is also used by