~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.h

  • Committer: Brian Aker
  • Date: 2011-04-11 05:54:41 UTC
  • mfrom: (2263.3.12 ot0)
  • Revision ID: brian@gir-3.local-20110411055441-z9w6zvybq019zyms
Merge in xtf

Show diffs side-by-side

added added

removed removed

Lines of Context:
36
36
#include <drizzled/global_charset_info.h>
37
37
#include <drizzled/base.h>
38
38
#include <drizzled/error.h>
39
 
#include <drizzled/open_tables_state.h>
 
39
#include <drizzled/lock.h>
40
40
#include <drizzled/pthread_globals.h>
41
41
#include <drizzled/sql_error.h>
42
42
#include <drizzled/sql_locale.h>
78
78
 * session object.
79
79
 */
80
80
 
81
 
class DRIZZLED_API Session : public Open_tables_state
 
81
class Open_tables_state;
 
82
 
 
83
class DRIZZLED_API Session
82
84
{
83
85
private:
84
86
  class impl_c;
1271
1273
   *
1272
1274
   * The lock will automaticaly be freed by close_thread_tables()
1273
1275
   */
1274
 
  bool openTablesLock(TableList *tables);
1275
 
  Table *open_temporary_table(const drizzled::identifier::Table &identifier, bool link_in_list= true);
 
1276
  bool openTablesLock(TableList*);
 
1277
  Table *open_temporary_table(const identifier::Table &identifier, bool link_in_list= true);
1276
1278
 
1277
1279
  int open_tables_from_list(TableList **start, uint32_t *counter, uint32_t flags= 0);
1278
1280
 
1350
1352
  drizzled::util::Storable* getProperty0(const std::string&);
1351
1353
  void setProperty0(const std::string&, drizzled::util::Storable*);
1352
1354
 
1353
 
 
1354
1355
  bool resetUsage()
1355
1356
  {
1356
1357
    return not getrusage(RUSAGE_THREAD, &usage);