← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/sync/sync0arr.c

  • Committer: Brian Aker
  • Date: 2010-11-06 15:43:10 UTC
  • mfrom: (1908.1.1 merge)
  • Revision ID: brian@tangent.org-20101106154310-g1jpjzwbc53pfc4f
Filesort encapsulation, plus modification to copy contructor

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/sync/sync0arr.c
138
138
                                        since creation of the array */
139
139
};
140
140
 
141
 
#ifdef UNIV_PFS_MUTEX
142
 
/* Key to register the mutex with performance schema */
143
 
UNIV_INTERN mysql_pfs_key_t     syn_arr_mutex_key;
144
 
#endif
145
 
 
146
141
#ifdef UNIV_SYNC_DEBUG
147
142
/******************************************************************//**
148
143
This function is called only in the debug version. Detects a deadlock
250
245
 
251
246
        /* Then create the mutex to protect the wait array complex */
252
247
        if (protection == SYNC_ARRAY_OS_MUTEX) {
253
 
                arr->os_mutex = os_mutex_create();
 
248
                arr->os_mutex = os_mutex_create(NULL);
254
249
        } else if (protection == SYNC_ARRAY_MUTEX) {
255
 
                mutex_create(syn_arr_mutex_key,
256
 
                             &arr->mutex, SYNC_NO_ORDER_CHECK);
 
250
                mutex_create(&arr->mutex, SYNC_NO_ORDER_CHECK);
257
251
        } else {
258
252
                ut_error;
259
253
        }
504
498
                   || type == RW_LOCK_WAIT_EX
505
499
                   || type == RW_LOCK_SHARED) {
506
500
 
507
 
                fputs(type == RW_LOCK_EX ? "X-lock on"
508
 
                      : type == RW_LOCK_WAIT_EX ? "X-lock (wait_ex) on"
509
 
                      : "S-lock on", file);
 
501
                fputs(type == RW_LOCK_EX ? "X-lock on" : "S-lock on", file);
510
502
 
511
503
                rwlock = cell->old_wait_rw_lock;
512
504