Commit 78c70c07 authored by marko's avatar marko

branches/zip: Enclose recv_recovery_from_backup_on and

recv_recovery_from_backup_is_on() in #ifdef UNIV_LOG_ARCHIVE.
parent b1cbc35e
...@@ -77,12 +77,14 @@ UNIV_INLINE ...@@ -77,12 +77,14 @@ UNIV_INLINE
ibool ibool
recv_recovery_is_on(void); recv_recovery_is_on(void);
/*=====================*/ /*=====================*/
#ifdef UNIV_LOG_ARCHIVE
/*********************************************************************** /***********************************************************************
Returns TRUE if recovery from backup is currently running. */ Returns TRUE if recovery from backup is currently running. */
UNIV_INLINE UNIV_INLINE
ibool ibool
recv_recovery_from_backup_is_on(void); recv_recovery_from_backup_is_on(void);
/*=================================*/ /*=================================*/
#endif /* UNIV_LOG_ARCHIVE */
/**************************************************************************** /****************************************************************************
Applies the hashed log records to the page, if the page lsn is less than the Applies the hashed log records to the page, if the page lsn is less than the
lsn of a log record. This can be called when a buffer page has just been lsn of a log record. This can be called when a buffer page has just been
......
...@@ -24,8 +24,6 @@ Created 9/20/1997 Heikki Tuuri ...@@ -24,8 +24,6 @@ Created 9/20/1997 Heikki Tuuri
#include "univ.i" #include "univ.i"
extern ibool recv_recovery_from_backup_on;
/*********************************************************************** /***********************************************************************
Returns TRUE if recovery is currently running. */ Returns TRUE if recovery is currently running. */
UNIV_INLINE UNIV_INLINE
...@@ -36,6 +34,9 @@ recv_recovery_is_on(void) ...@@ -36,6 +34,9 @@ recv_recovery_is_on(void)
return(UNIV_UNLIKELY(recv_recovery_on)); return(UNIV_UNLIKELY(recv_recovery_on));
} }
#ifdef UNIV_LOG_ARCHIVE
extern ibool recv_recovery_from_backup_on;
/*********************************************************************** /***********************************************************************
Returns TRUE if recovery from backup is currently running. */ Returns TRUE if recovery from backup is currently running. */
UNIV_INLINE UNIV_INLINE
...@@ -45,4 +46,4 @@ recv_recovery_from_backup_is_on(void) ...@@ -45,4 +46,4 @@ recv_recovery_from_backup_is_on(void)
{ {
return(recv_recovery_from_backup_on); return(recv_recovery_from_backup_on);
} }
#endif /* UNIV_LOG_ARCHIVE */
...@@ -60,7 +60,9 @@ this must be less than UNIV_PAGE_SIZE as it is stored in the buffer pool */ ...@@ -60,7 +60,9 @@ this must be less than UNIV_PAGE_SIZE as it is stored in the buffer pool */
UNIV_INTERN recv_sys_t* recv_sys = NULL; UNIV_INTERN recv_sys_t* recv_sys = NULL;
UNIV_INTERN ibool recv_recovery_on = FALSE; UNIV_INTERN ibool recv_recovery_on = FALSE;
#ifdef UNIV_LOG_ARCHIVE
UNIV_INTERN ibool recv_recovery_from_backup_on = FALSE; UNIV_INTERN ibool recv_recovery_from_backup_on = FALSE;
#endif /* UNIV_LOG_ARCHIVE */
UNIV_INTERN ibool recv_needed_recovery = FALSE; UNIV_INTERN ibool recv_needed_recovery = FALSE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment