From: Heikki Linnakangas <heikki@enterprisedb.com>
Date: Wed, 18 Feb 2009 14:19:08 +0000 (+0200)
Subject: Replace two remaining calls of IsRecoveryProcessingMode() with
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=2b51cc6ae0c2e8c30b18a3839dde19a671c72cd5;p=users%2Fsimon%2Fpostgres.git

Replace two remaining calls of IsRecoveryProcessingMode() with
RecoveryInProgress().
---

diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c
index 881a588d69..a36d049ca7 100644
--- a/src/backend/access/transam/multixact.c
+++ b/src/backend/access/transam/multixact.c
@@ -1545,7 +1545,7 @@ CheckPointMultiXact(void)
 	 * SimpleLruTruncate would get confused.  It seems best not to risk
 	 * removing any data during recovery anyway, so don't truncate.
 	 */
-	if (!IsRecoveryProcessingMode())
+	if (!RecoveryInProgress())
 		TruncateMultiXact();
 
 	TRACE_POSTGRESQL_MULTIXACT_CHECKPOINT_DONE(true);
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index dfc49c73a7..3654206c6b 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -394,7 +394,7 @@ AssignTransactionId(TransactionState s)
 	bool		isSubXact = (s->parent != NULL);
 	ResourceOwner currentOwner;
 
-	if (IsRecoveryProcessingMode())
+	if (RecoveryInProgress())
 		elog(ERROR, "cannot assign TransactionIds during recovery");
 
 	/* Assert that caller didn't screw up */