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 881a588d69c0aca34283f64e24061ceb708b0da2..a36d049ca7f1a8994a99e8a8c386f464e536ba67 100644 (file)
--- 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 dfc49c73a7111306e6ee4fb92675c7008fa3d2f2..3654206c6bbd69dd4296ad5afd9b5b276c41f0b1 100644 (file)
--- 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 */