summaryrefslogtreecommitdiff
path: root/storage/innobase
diff options
context:
space:
mode:
authorVasil Dimov <vasil.dimov@oracle.com>2010-09-14 12:41:00 +0300
committerVasil Dimov <vasil.dimov@oracle.com>2010-09-14 12:41:00 +0300
commit27c84cf762dc201b82c598af15cbac6fdf61d323 (patch)
treecafb6d5b1fbbe6baa5d5462e80f966a6b326b451 /storage/innobase
parent8e942b3265db5289f60c118ea66c20f2f6fe16bd (diff)
downloadmariadb-git-27c84cf762dc201b82c598af15cbac6fdf61d323.tar.gz
(partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6
Fix compiler warning: log/log0recv.c: In function 'recv_recovery_from_checkpoint_start': log/log0recv.c:2509:10: error: variable 'archived_lsn' set but not used [-Werror=unused-but-set-variable]
Diffstat (limited to 'storage/innobase')
-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 e6524eeefbf..f896b11a519 100644
--- a/storage/innobase/log/log0recv.c
+++ b/storage/innobase/log/log0recv.c
@@ -2506,7 +2506,9 @@ recv_recovery_from_checkpoint_start(
dulint old_scanned_lsn;
dulint group_scanned_lsn;
dulint contiguous_lsn;
+#ifdef UNIV_LOG_ARCHIVE
dulint archived_lsn;
+#endif /* UNIV_LOG_ARCHIVE */
ulint capacity;
byte* buf;
byte log_hdr_buf[LOG_FILE_HDR_SIZE];
@@ -2552,7 +2554,9 @@ recv_recovery_from_checkpoint_start(
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 */