← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • 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/sync/sync0sync.c
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (C) 1995, 2010, Innobase Oy. All Rights Reserved.
4
 
Copyright (C) 2008, Google Inc.
 
3
Copyright (c) 1995, 2010, Innobase Oy. All Rights Reserved.
 
4
Copyright (c) 2008, Google Inc.
5
5
 
6
6
Portions of this file contain modifications contributed and copyrighted by
7
7
Google, Inc. Those modifications are gratefully acknowledged and are described
381
381
mutex_enter_nowait_func(
382
382
/*====================*/
383
383
        mutex_t*        mutex,          /*!< in: pointer to mutex */
384
 
        const char*     /*file_name __attribute__((unused))*/,
 
384
        const char*     file_name __attribute__((unused)),
385
385
                                        /*!< in: file name where mutex
386
386
                                        requested */
387
 
        ulint           /*line __attribute__((unused))*/)
 
387
        ulint           line __attribute__((unused)))
388
388
                                        /*!< in: line where requested */
389
389
{
390
390
        ut_ad(mutex_validate(mutex));
1207
1207
 
1208
1208
        case SYNC_BUF_BLOCK:
1209
1209
                /* Either the thread must own the buffer pool mutex
1210
 
                (buf_pool->mutex), or it is allowed to latch only ONE
1211
 
                buffer block (block->mutex or buf_pool->zip_mutex). */
 
1210
                (buf_pool_mutex), or it is allowed to latch only ONE
 
1211
                buffer block (block->mutex or buf_pool_zip_mutex). */
1212
1212
                if (!sync_thread_levels_g(array, level, FALSE)) {
1213
1213
                        ut_a(sync_thread_levels_g(array, level - 1, TRUE));
1214
1214
                        ut_a(sync_thread_levels_contain(array, SYNC_BUF_POOL));