diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-05-31 12:19:16 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-05-31 12:19:16 +0300 |
| commit | b369c09dc252e897d367cf0f864141ebd26aba26 (patch) | |
| tree | f3386d22e6d91d2fda383ebdb01fdb4614ff56ad /innobase | |
| parent | 1158d8a263c750fd96c43a9c6bcc37bba8e9fb5c (diff) | |
| parent | b6cae0f64707aca9ec2bbc437f87a84e53fbfec7 (diff) | |
| download | mariadb-git-b369c09dc252e897d367cf0f864141ebd26aba26.tar.gz | |
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/include/sync0sync.ic | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/innobase/include/sync0sync.ic b/innobase/include/sync0sync.ic index e23e2b68e14..5a872c6b093 100644 --- a/innobase/include/sync0sync.ic +++ b/innobase/include/sync0sync.ic @@ -134,9 +134,10 @@ mutex_reset_lock_word( __asm XCHG EDX, DWORD PTR [ECX] #else mutex->lock_word = 0; - +#if !(defined(__GNUC__) && defined(UNIV_INTEL_X86)) os_fast_mutex_unlock(&(mutex->os_fast_mutex)); #endif +#endif } /********************************************************************** |