← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/sync0sync.ic

  • Committer: Lee Bieber
  • Date: 2010-12-03 01:16:19 UTC
  • mfrom: (1819.9.81 update-innobase)
  • Revision ID: kalebral@gmail.com-20101203011619-n6v584rijwdet05b
Merge Stewart - update Innobase plugin based on InnoDB 1.1.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/include/sync0sync.ic
237
237
        ulint           line)           /*!< in: line where locked */
238
238
{
239
239
        struct PSI_mutex_locker*        locker = NULL;
 
240
        PSI_mutex_locker_state          state;
240
241
        int     result = 0;
241
242
 
242
243
        if (UNIV_LIKELY(PSI_server && mutex->pfs_psi)) {
243
244
                locker = PSI_server->get_thread_mutex_locker(
244
 
                                mutex->pfs_psi, PSI_MUTEX_LOCK);
 
245
                                &state, mutex->pfs_psi, PSI_MUTEX_LOCK);
245
246
                if (locker) {
246
247
                        PSI_server->start_mutex_wait(locker, file_name, line);
247
248
                }
270
271
{
271
272
        ulint   ret;
272
273
        struct PSI_mutex_locker*        locker = NULL;
 
274
        PSI_mutex_locker_state          state;
273
275
        int     result = 0;
274
276
 
275
277
        if (UNIV_LIKELY(PSI_server && mutex->pfs_psi)) {
276
278
                locker = PSI_server->get_thread_mutex_locker(
277
 
                                mutex->pfs_psi, PSI_MUTEX_LOCK);
 
279
                                &state, mutex->pfs_psi, PSI_MUTEX_LOCK);
278
280
                if (locker) {
279
281
                        PSI_server->start_mutex_wait(locker, file_name, line);
280
282
                }
300
302
        mutex_t*        mutex)  /*!< in: pointer to mutex */
301
303
{
302
304
        if (UNIV_LIKELY(PSI_server && mutex->pfs_psi)) {
303
 
                struct PSI_thread*      thread;
304
 
                thread = PSI_server->get_thread();
305
 
 
306
 
                if (thread) {
307
 
                        PSI_server->unlock_mutex(thread, mutex->pfs_psi);
308
 
                }
 
305
                PSI_server->unlock_mutex(mutex->pfs_psi);
309
306
        }
310
307
 
311
308
        mutex_exit_func(mutex);