diff options
| author | monty@mysql.com <> | 2004-07-07 11:29:39 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-07-07 11:29:39 +0300 |
| commit | 1e311999950833cd81ca0788cd3656585c46d9ae (patch) | |
| tree | ca8974710746bb69b04a49bc64f938d0b1a8420a /innobase/sync/sync0sync.c | |
| parent | 24a8dc2337a717ff340bac228383ef04437a4666 (diff) | |
| parent | 8462b8aeb83355fa6c5cb4f45ea0ed63ba9e0712 (diff) | |
| download | mariadb-git-1e311999950833cd81ca0788cd3656585c46d9ae.tar.gz | |
Merge with 4.1.3-beta
Diffstat (limited to 'innobase/sync/sync0sync.c')
| -rw-r--r-- | innobase/sync/sync0sync.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/innobase/sync/sync0sync.c b/innobase/sync/sync0sync.c index 31f287b6341..86306e49cac 100644 --- a/innobase/sync/sync0sync.c +++ b/innobase/sync/sync0sync.c @@ -214,7 +214,7 @@ mutex_create_func( mutex->magic_n = MUTEX_MAGIC_N; #ifdef UNIV_SYNC_DEBUG mutex->line = 0; - mutex->file_name = (char *) "not yet reserved"; + mutex->file_name = "not yet reserved"; #endif /* UNIV_SYNC_DEBUG */ mutex->level = SYNC_LEVEL_NONE; mutex->cfile_name = cfile_name; @@ -314,7 +314,6 @@ mutex_enter_nowait( return(1); } -#ifdef UNIV_DEBUG /********************************************************************** Checks that the mutex has been initialized. */ @@ -328,7 +327,6 @@ mutex_validate( return(TRUE); } -#endif /* UNIV_DEBUG */ /********************************************************************** Sets the waiters field in a mutex. */ @@ -512,7 +510,7 @@ void mutex_set_debug_info( /*=================*/ mutex_t* mutex, /* in: mutex */ - char* file_name, /* in: file where requested */ + const char* file_name, /* in: file where requested */ ulint line) /* in: line where requested */ { ut_ad(mutex); @@ -1077,12 +1075,8 @@ sync_thread_add_level( } else if (level == SYNC_DICT_HEADER) { ut_a(sync_thread_levels_g(array, SYNC_DICT_HEADER)); } else if (level == SYNC_DICT) { -#ifdef UNIV_DEBUG - ut_a(buf_debug_prints || - sync_thread_levels_g(array, SYNC_DICT)); -#else /* UNIV_DEBUG */ - ut_a(sync_thread_levels_g(array, SYNC_DICT)); -#endif /* UNIV_DEBUG */ + ut_a(buf_debug_prints + || sync_thread_levels_g(array, SYNC_DICT)); } else { ut_error; } |