← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/os/os0sync.c

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/os/os0sync.c
35
35
 
36
36
#include "ut0mem.h"
37
37
#include "srv0start.h"
 
38
#include "ha_prototypes.h"
38
39
 
39
40
/* Type definition for an operating system mutex struct */
40
41
struct os_mutex_struct{
631
632
 
632
633
        InitializeCriticalSection((LPCRITICAL_SECTION) fast_mutex);
633
634
#else
634
 
        ut_a(0 == pthread_mutex_init(fast_mutex, MY_MUTEX_INIT_FAST));
 
635
        ut_a(0 == innobase_fast_mutex_init(fast_mutex));
635
636
#endif
636
637
        if (UNIV_LIKELY(os_sync_mutex_inited)) {
637
638
                /* When creating os_sync_mutex itself (in Unix) we cannot