← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/catalog/instance.h

edit

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/catalog/instance.h
24
24
#include <boost/thread/mutex.hpp>
25
25
#include <boost/make_shared.hpp>
26
26
 
27
 
#include <drizzled/message/catalog.h>
28
 
#include <drizzled/identifier/session.h>
 
27
#include "drizzled/message/catalog.h"
 
28
#include "drizzled/identifier/session.h"
29
29
 
30
30
namespace drizzled {
31
31
namespace catalog {
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;
45
44
 
46
45
 
47
46
public:
61
60
    _message= message_arg;
62
61
  };
63
62
 
64
 
  static shared_ptr make_shared(message::catalog::shared_ptr &message_arg)
 
63
  static shared_ptr create(message::catalog::shared_ptr &message_arg)
65
64
  {
66
65
    assert(not message_arg->name().empty());
67
66
    return boost::make_shared<Instance>(message_arg);
68
67
  };
69
68
 
70
 
  static shared_ptr make_shared(const identifier::Catalog &identifier)
 
69
  static shared_ptr create(const identifier::Catalog &identifier)
71
70
  {
72
71
    drizzled::message::catalog::shared_ptr new_message= drizzled::message::catalog::make_shared(identifier);
73
72
    assert(not new_message->name().empty());
131
130
  {
132
131
    return _schema_lock;
133
132
  }
134
 
 
135
 
  boost::mutex &systemVariableLock()
136
 
  {
137
 
    return _system_variable_lock;
138
 
  }
139
133
};
140
134
 
141
135
} /* namespace catalog */