From b045a484e84f01cf921b0dcc22ebff4d8bcb63b5 Mon Sep 17 00:00:00 2001 From: marko <> Date: Tue, 16 Feb 2010 12:53:20 +0000 Subject: [PATCH] branches/zip: log_reserve_and_write_fast(): Correct a race condition in UNIV_LOG_LSN_DEBUG. This could have caused Issue #440. --- include/log0log.ic | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/log0log.ic b/include/log0log.ic index 36d151a3064..098ef47d761 100644 --- a/include/log0log.ic +++ b/include/log0log.ic @@ -314,12 +314,15 @@ log_reserve_and_write_fast( ulint data_len; #ifdef UNIV_LOG_LSN_DEBUG /* length of the LSN pseudo-record */ - ulint lsn_len = 1 - + mach_get_compressed_size(log_sys->lsn >> 32) - + mach_get_compressed_size(log_sys->lsn & 0xFFFFFFFFUL); + ulint lsn_len; #endif /* UNIV_LOG_LSN_DEBUG */ mutex_enter(&log_sys->mutex); +#ifdef UNIV_LOG_LSN_DEBUG + lsn_len = 1 + + mach_get_compressed_size(log_sys->lsn >> 32) + + mach_get_compressed_size(log_sys->lsn & 0xFFFFFFFFUL); +#endif /* UNIV_LOG_LSN_DEBUG */ data_len = len #ifdef UNIV_LOG_LSN_DEBUG