diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-08-04 10:39:53 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-08-04 10:39:53 +0200 |
| commit | 3f1c763a94cd25c4810692983f6e61b528e21268 (patch) | |
| tree | d8f9632933303f9bdf8cdc875613ca99f51ecbcb /storage/xtradb/include/log0log.ic | |
| parent | a74d04671d23fa65bd610184965cc2974ec41cf9 (diff) | |
| parent | 0c6afe17dceb926b5c757157308188e540caec1e (diff) | |
| download | mariadb-git-3f1c763a94cd25c4810692983f6e61b528e21268.tar.gz | |
Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB.
Diffstat (limited to 'storage/xtradb/include/log0log.ic')
| -rw-r--r-- | storage/xtradb/include/log0log.ic | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/storage/xtradb/include/log0log.ic b/storage/xtradb/include/log0log.ic index 36d151a3064..139f4041a36 100644 --- a/storage/xtradb/include/log0log.ic +++ b/storage/xtradb/include/log0log.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1995, 2010, Innobase Oy. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -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 |