← 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: 2011-01-13 01:27:33 UTC
  • mfrom: (2069.4.4 clean)
  • mto: This revision was merged to the branch mainline in revision 2078.
  • Revision ID: brian@gir-3-20110113012733-1xg5mqvu1f0i1urr
Merge in the move for share to be the instance for table.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.h
1858
1858
 
1859
1859
  void get_xid(DRIZZLE_XID *xid); // Innodb only
1860
1860
 
1861
 
  table::Instance *getInstanceTable();
1862
 
  table::Instance *getInstanceTable(List<CreateField> &field_list);
 
1861
  table::Singular *getInstanceTable();
 
1862
  table::Singular *getInstanceTable(List<CreateField> &field_list);
1863
1863
 
1864
1864
private:
1865
1865
  bool resetUsage()
1899
1899
  // This lives throughout the life of Session
1900
1900
  bool use_usage;
1901
1901
  PropertyMap life_properties;
1902
 
  std::vector<table::Instance *> temporary_shares;
 
1902
  std::vector<table::Singular *> temporary_shares;
1903
1903
  struct rusage usage;
1904
1904
};
1905
1905