← Back to branch summary

~thomir-deactivatedaccount/drizzle/drizzle-fix-bug653747

« back to all changes in this revision

Viewing changes to drizzled/thr_lock.h

  • Committer: Brian Aker
  • Date: 2010-10-10 02:07:52 UTC
  • mfrom: (1827.2.3 staging)
  • Revision ID: brian@tangent.org-20101010020752-ktv73isay5dxtvp3
Merge in switch on table_share_instance inheritance.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/thr_lock.h
19
19
#define DRIZZLED_THR_LOCK_H
20
20
 
21
21
#include <boost/thread/mutex.hpp>
22
 
#include <boost/thread/shared_mutex.hpp>
23
22
#include <boost/thread/condition_variable.hpp>
24
23
#include <pthread.h>
25
24
 
111
110
  THR_LOCK_OWNER *owner;
112
111
  struct THR_LOCK_DATA *next,**prev;
113
112
  struct THR_LOCK *lock;
114
 
  boost::condition_variable_any *cond;
 
113
  boost::condition_variable *cond;
115
114
  enum thr_lock_type type;
116
115
  void *status_param;                   /* Param to status functions */
117
116