summaryrefslogtreecommitdiff
path: root/innobase/sync
diff options
context:
space:
mode:
authorunknown <heikki@hundin.mysql.fi>2004-03-22 18:07:49 +0200
committerunknown <heikki@hundin.mysql.fi>2004-03-22 18:07:49 +0200
commit741f55c667169c4ea1f91719a50e5652f2a81f38 (patch)
tree1eb0a547f9ea9c2a198e13fb4013929f69701f45 /innobase/sync
parent6a4c0ccb1485b3ad15f92513eaa1724b25683e8f (diff)
parentc656035e67c0a565375138e233f4dc394747ae97 (diff)
downloadmariadb-git-741f55c667169c4ea1f91719a50e5652f2a81f38.tar.gz
Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-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 4f5d27bcc7c..fc312a65942 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) && !defined(__NETWARE__)
mutex_reset_lock_word(mutex);
#else
os_fast_mutex_init(&(mutex->os_fast_mutex));