← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.h

  • Committer: Brian Aker
  • Date: 2010-03-05 03:12:24 UTC
  • mfrom: (1273.1.32 bug530870)
  • Revision ID: brian@gaz-20100305031224-ijnk5d5n4dut5mtv
Merge Jay's bugfix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.h
75
75
class CopyField;
76
76
class Table_ident;
77
77
 
78
 
 
79
78
extern char internal_table_name[2];
80
79
extern char empty_c_string[1];
81
80
extern const char **errmesg;
525
524
 
526
525
private:
527
526
  /* container for handler's private per-connection data */
528
 
  Ha_data ha_data[MAX_HA];
 
527
  std::vector<Ha_data> ha_data;
529
528
  /*
530
529
    Id of current query. Statement can be reused to execute several queries
531
530
    query_id is global in context of the whole MySQL server.
537
536
  query_id_t query_id;
538
537
  query_id_t warn_query_id;
539
538
public:
540
 
  void **getEngineData(const plugin::StorageEngine *engine);
541
 
  ResourceContext *getResourceContext(const plugin::StorageEngine *engine,
 
539
  void **getEngineData(const plugin::MonitoredInTransaction *monitored);
 
540
  ResourceContext *getResourceContext(const plugin::MonitoredInTransaction *monitored,
542
541
                                      size_t index= 0);
543
542
 
544
543
  struct st_transactions {