← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/thr_lock.h

  • Committer: Andrew Hutchings
  • Date: 2010-12-15 18:59:55 UTC
  • mto: This revision was merged to the branch mainline in revision 2006.
  • Revision ID: andrew@linuxjedi.co.uk-20101215185955-q12lkja8hdnpjqg7
Make the test look for drizzleadmin failure instead of success as this test is not possible to fix for success on our FreeBSD 8.0 box

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/thr_lock.h
22
22
#include <boost/thread/shared_mutex.hpp>
23
23
#include <boost/thread/condition_variable.hpp>
24
24
 
25
 
#include "drizzled/visibility.h"
26
 
 
27
25
namespace drizzled
28
26
{
29
27
 
106
104
struct THR_LOCK;
107
105
struct THR_LOCK_DATA;
108
106
 
109
 
struct DRIZZLED_API THR_LOCK_DATA {
 
107
struct THR_LOCK_DATA {
110
108
  THR_LOCK_OWNER *owner;
111
109
  struct THR_LOCK_DATA *next,**prev;
112
110
  struct THR_LOCK *lock;
187
185
class Session; 
188
186
 
189
187
#define thr_lock_owner_init(owner, info_arg) (owner)->info= (info_arg)
190
 
DRIZZLED_API void thr_lock_init(THR_LOCK *lock);
 
188
void thr_lock_init(THR_LOCK *lock);
191
189
enum enum_thr_lock_result thr_multi_lock(Session &session, THR_LOCK_DATA **data,
192
190
                                         uint32_t count, THR_LOCK_OWNER *owner);
193
191
void thr_multi_unlock(THR_LOCK_DATA **data,uint32_t count);