summaryrefslogtreecommitdiff
path: root/innobase/sync
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-03-25 23:29:45 +0200
committermonty@mysql.com <>2004-03-25 23:29:45 +0200
commite0e0314d606399778f595d33a191c248f15cb4c2 (patch)
tree7815fb40163d1db39e3991dcd19341ef57d08d74 /innobase/sync
parent3b34a6a2dd73792e1b79047a491bd02b30d5ec68 (diff)
parent488fe61074a83ff31e6ac2f609ba596f903f4d4d (diff)
downloadmariadb-git-e0e0314d606399778f595d33a191c248f15cb4c2.tar.gz
Merge with 4.0
Diffstat (limited to 'innobase/sync')
-rw-r--r--innobase/sync/sync0sync.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/sync/sync0sync.c b/innobase/sync/sync0sync.c
index 6ad766d8bc8..64f76f5ee77 100644
--- a/innobase/sync/sync0sync.c
+++ b/innobase/sync/sync0sync.c
@@ -180,7 +180,7 @@ mutex_create_func(
char* cfile_name, /* in: file name where created */
ulint cline) /* in: file line where created */
{
-#if defined(_WIN32) && defined(UNIV_CAN_USE_X86_ASSEMBLER) && !defined(__NETWARE)
+#if defined(_WIN32) && defined(UNIV_CAN_USE_X86_ASSEMBLER)
mutex_reset_lock_word(mutex);
#else
os_fast_mutex_init(&(mutex->os_fast_mutex));