← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.h

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.h
23
23
 
24
24
/* Classes in mysql */
25
25
 
26
 
#include <drizzled/sql_plugin.h>
 
26
#include "drizzled/plugin.h"
27
27
#include <drizzled/sql_locale.h>
28
28
#include <drizzled/ha_trx_info.h>
29
29
#include <mysys/my_alloc.h>
33
33
#include <drizzled/sql_error.h>
34
34
#include <drizzled/file_exchange.h>
35
35
#include <drizzled/select_result_interceptor.h>
36
 
#include <drizzled/authentication.h>
37
36
#include <drizzled/db.h>
38
37
#include <drizzled/xid.h>
39
38
 
170
169
  /* TODO: change this to my_thread_id - but have to fix set_var first */
171
170
  uint64_t pseudo_thread_id;
172
171
 
173
 
  StorageEngine *storage_engine;
 
172
  drizzled::plugin::StorageEngine *storage_engine;
174
173
 
175
174
  /* Only charset part of these variables is sensible */
176
175
  const CHARSET_INFO  *character_set_filesystem;
1410
1409
  void close_temporary_table(Table *table, bool free_share, bool delete_table);
1411
1410
  void close_temporary(Table *table, bool free_share, bool delete_table);
1412
1411
  int drop_temporary_table(TableList *table_list);
1413
 
  bool rm_temporary_table(StorageEngine *base, char *path);
 
1412
  bool rm_temporary_table(drizzled::plugin::StorageEngine *base, char *path);
1414
1413
  Table *open_temporary_table(const char *path, const char *db,
1415
1414
                              const char *table_name, bool link_in_list,
1416
1415
                              open_table_mode open_mode);