diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-12-01 22:24:49 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-12-01 22:24:49 +0200 |
| commit | 1a2df3f4eb403875406a72c39efce8a2fb6d32ac (patch) | |
| tree | 9281b03f843a743d3d4db19828044eaa24406dc9 /storage | |
| parent | 863a493b4f521eb7a5002e2dea6c0148ed1ada0b (diff) | |
| parent | 41df9be0ff28a4a63ba9042d6b67557092018cac (diff) | |
| download | mariadb-git-1a2df3f4eb403875406a72c39efce8a2fb6d32ac.tar.gz | |
automatic merge with 5.1
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/xtradb/sync/sync0rw.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/xtradb/sync/sync0rw.c b/storage/xtradb/sync/sync0rw.c index 5dc6b28d4bf..f1018522fdf 100644 --- a/storage/xtradb/sync/sync0rw.c +++ b/storage/xtradb/sync/sync0rw.c @@ -247,10 +247,11 @@ rw_lock_create_func( lock->mutex.cmutex_name = cmutex_name; ut_d(lock->mutex.mutex_type = 1); -#else /* INNODB_RW_LOCKS_USE_ATOMICS */ +#endif /* INNODB_RW_LOCKS_USE_ATOMICS */ +#if defined(INNODB_RW_LOCKS_USE_ATOMICS) || !defined(UNIV_DEBUG) (void) cfile_name; (void) cline; -#endif /* INNODB_RW_LOCKS_USE_ATOMICS */ +#endif lock->lock_word = X_LOCK_DECR; lock->waiters = 0; |