← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/catalog/instance.h

  • Committer: Lee Bieber
  • Date: 2011-01-26 04:38:57 UTC
  • mfrom: (2115.1.2 drizzle-build)
  • Revision ID: kalebral@gmail.com-20110126043857-d5oegxrszux47793
Merge Brian - Merge in latest catalog changes
Merge Brian remove error numbers in tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/catalog/instance.h
41
41
  drizzled::session_id_t _lock_id;
42
42
  message::catalog::shared_ptr _message;
43
43
  mutable boost::mutex _schema_lock;
 
44
  mutable boost::mutex _system_variable_lock;
44
45
 
45
46
 
46
47
public:
130
131
  {
131
132
    return _schema_lock;
132
133
  }
 
134
 
 
135
  boost::mutex &systemVariableLock()
 
136
  {
 
137
    return _system_variable_lock;
 
138
  }
133
139
};
134
140
 
135
141
} /* namespace catalog */