diff options
| author | monty@hundin.mysql.fi <> | 2002-04-25 01:16:42 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-04-25 01:16:42 +0300 |
| commit | 727122aadd80f9e1a127bcc1562c8dc95d786e4a (patch) | |
| tree | 539e3f41736108728458d901c552313e5f058e8f /innobase/sync | |
| parent | 1f5f3612f30d67029fe9cc2ff5d5e44daa5698f2 (diff) | |
| parent | ecf2c4e15a677a9f33ba8e7d6b2eb6a9da6538e4 (diff) | |
| download | mariadb-git-727122aadd80f9e1a127bcc1562c8dc95d786e4a.tar.gz | |
merge
Diffstat (limited to 'innobase/sync')
| -rw-r--r-- | innobase/sync/sync0sync.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/innobase/sync/sync0sync.c b/innobase/sync/sync0sync.c index 3f40aa166ee..144ed263db9 100644 --- a/innobase/sync/sync0sync.c +++ b/innobase/sync/sync0sync.c @@ -220,7 +220,7 @@ mutex_create_func( char* cfile_name, /* in: file name where created */ ulint cline) /* in: file line where created */ { -#ifdef _WIN32 +#if defined(_WIN32) && defined(UNIV_CAN_USE_X86_ASSEMBLER) mutex_reset_lock_word(mutex); #else os_fast_mutex_init(&(mutex->os_fast_mutex)); @@ -273,7 +273,7 @@ mutex_free( mutex_exit(&mutex_list_mutex); -#ifndef _WIN32 +#if !defined(_WIN32) || !defined(UNIV_CAN_USE_X86_ASSEMBLER) os_fast_mutex_free(&(mutex->os_fast_mutex)); #endif /* If we free the mutex protecting the mutex list (freeing is @@ -1009,7 +1009,7 @@ sync_thread_add_level( } else if (level == SYNC_ANY_LATCH) { ut_a(sync_thread_levels_g(array, SYNC_ANY_LATCH)); } else if (level == SYNC_TRX_SYS_HEADER) { - ut_a(sync_thread_levels_contain(array, SYNC_KERNEL)); + ut_a(sync_thread_levels_g(array, SYNC_TRX_SYS_HEADER)); } else if (level == SYNC_DOUBLEWRITE) { ut_a(sync_thread_levels_g(array, SYNC_DOUBLEWRITE)); } else if (level == SYNC_BUF_BLOCK) { |