← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/include/sync0sync.h

Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/include/sync0sync.h
18
18
#include "sync0arr.h"
19
19
 
20
20
#ifndef UNIV_HOTBACKUP
21
 
extern my_bool  timed_mutexes;
 
21
extern bool     timed_mutexes;
22
22
#endif /* UNIV_HOTBACKUP */
23
23
 
24
24
/**********************************************************************
503
503
        ulong           count_spin_loop; /* count of spin loops */
504
504
        ulong           count_spin_rounds; /* count of spin rounds */
505
505
        ulong           count_os_yield; /* count of os_wait */
506
 
        ulonglong       lspent_time; /* mutex os_wait timer msec */
507
 
        ulonglong       lmax_spent_time; /* mutex os_wait timer msec */
 
506
        uint64_t        lspent_time; /* mutex os_wait timer msec */
 
507
        uint64_t        lmax_spent_time; /* mutex os_wait timer msec */
508
508
        const char*     cmutex_name;/* mutex name */
509
509
        ulint           mutex_type;/* 0 - usual mutex 1 - rw_lock mutex  */
510
510
# endif /* UNIV_DEBUG */