summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasil Dimov <vasil.dimov@oracle.com>2010-09-20 18:55:54 +0300
committerVasil Dimov <vasil.dimov@oracle.com>2010-09-20 18:55:54 +0300
commit70330ca9179a764dc700d4bb0bc91994b191ef36 (patch)
tree970e94ba2420c0b38b00a568aabec1e05979b4c7
parent191b5943229334ce1daac6aa22f3d5c8791f8d24 (diff)
downloadmariadb-git-70330ca9179a764dc700d4bb0bc91994b191ef36.tar.gz
(log0recv.c:2905) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
-rw-r--r--storage/innobase/log/log0recv.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c
index f6d90e4e330..5d5caf1b48a 100644
--- a/storage/innobase/log/log0recv.c
+++ b/storage/innobase/log/log0recv.c
@@ -2902,7 +2902,9 @@ recv_recovery_from_checkpoint_start_func(
ib_uint64_t old_scanned_lsn;
ib_uint64_t group_scanned_lsn;
ib_uint64_t contiguous_lsn;
+#ifdef UNIV_LOG_ARCHIVE
ib_uint64_t archived_lsn;
+#endif /* UNIV_LOG_ARCHIVE */
byte* buf;
byte log_hdr_buf[LOG_FILE_HDR_SIZE];
ulint err;
@@ -2957,7 +2959,9 @@ recv_recovery_from_checkpoint_start_func(
checkpoint_lsn = mach_read_from_8(buf + LOG_CHECKPOINT_LSN);
checkpoint_no = mach_read_from_8(buf + LOG_CHECKPOINT_NO);
+#ifdef UNIV_LOG_ARCHIVE
archived_lsn = mach_read_from_8(buf + LOG_CHECKPOINT_ARCHIVED_LSN);
+#endif /* UNIV_LOG_ARCHIVE */
/* Read the first log file header to print a note if this is
a recovery from a restored InnoDB Hot Backup */