← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/catalog/instance.h

  • Committer: Brian Aker
  • Date: 2011-01-07 20:07:55 UTC
  • mto: (2067.3.1 clean)
  • mto: This revision was merged to the branch mainline in revision 2073.
  • Revision ID: brian@tangent.org-20110107200755-igzg029ujqep5rei
A few small fixes, plus move the schema lock to the actual catalog.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/catalog/instance.h
21
21
#ifndef DRIZZLED_CATALOG_INSTANCE_H
22
22
#define DRIZZLED_CATALOG_INSTANCE_H
23
23
 
 
24
#include <boost/thread/mutex.hpp>
24
25
#include <boost/make_shared.hpp>
 
26
 
25
27
#include "drizzled/message/catalog.h"
26
28
#include "drizzled/identifier/session.h"
27
29
 
38
40
  bool _locked;
39
41
  drizzled::session_id_t _lock_id;
40
42
  message::catalog::shared_ptr _message;
 
43
  mutable boost::mutex _schema_lock;
 
44
 
41
45
 
42
46
public:
43
47
  typedef boost::shared_ptr<Instance> shared_ptr;
44
48
  typedef std::vector<shared_ptr> vector;
45
49
  typedef const Instance* const_pointer;
 
50
  typedef const Instance& const_reference;
 
51
  typedef Instance& reference;
46
52
 
47
53
  Instance(message::catalog::shared_ptr &message_arg)
48
54
  {
119
125
 
120
126
    return false;
121
127
  }
 
128
 
 
129
  boost::mutex &schemaLock()
 
130
  {
 
131
    return _schema_lock;
 
132
  }
122
133
};
123
134
 
124
135
} /* namespace catalog */