← 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
34
34
#include <drizzled/file_exchange.h>
35
35
#include <drizzled/select_result_interceptor.h>
36
36
#include <drizzled/xid.h>
 
37
#include "drizzled/query_id.h"
37
38
 
38
39
#include <netdb.h>
39
40
#include <map>
520
521
    Both of the following container points in session will be converted to an API.
521
522
  */
522
523
 
 
524
private:
523
525
  /* container for handler's private per-connection data */
524
526
  Ha_data ha_data[MAX_HA];
 
527
public:
 
528
  void **getEngineData(const drizzled::plugin::StorageEngine *engine);
 
529
  Ha_trx_info *getEngineInfo(const drizzled::plugin::StorageEngine *engine,
 
530
                             size_t index= 0);
 
531
 
525
532
 
526
533
  /* container for replication data */
527
534
  void *replication_data;
1474
1481
      return variables.storage_engine;
1475
1482
    return global_system_variables.storage_engine;
1476
1483
  };
 
1484
 
 
1485
  static void unlink(Session *session);
 
1486
 
1477
1487
};
1478
1488
 
1479
1489
class JOIN;