diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 45350cac23c..3577cf1b72e 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -645,7 +645,6 @@ static TimeLineID openLogTLI = 0; * Those values are kept consistent as long as crash recovery runs. */ static XLogRecPtr LocalMinRecoveryPoint; -static TimeLineID LocalMinRecoveryPointTLI; static bool updateMinRecoveryPoint = true; /* For WALInsertLockAcquire/Release functions */ @@ -2722,7 +2721,6 @@ UpdateMinRecoveryPoint(XLogRecPtr lsn, bool force) /* update local copy */ LocalMinRecoveryPoint = ControlFile->minRecoveryPoint; - LocalMinRecoveryPointTLI = ControlFile->minRecoveryPointTLI; if (XLogRecPtrIsInvalid(LocalMinRecoveryPoint)) updateMinRecoveryPoint = false; @@ -2757,7 +2755,6 @@ UpdateMinRecoveryPoint(XLogRecPtr lsn, bool force) ControlFile->minRecoveryPointTLI = newMinRecoveryPointTLI; UpdateControlFile(); LocalMinRecoveryPoint = newMinRecoveryPoint; - LocalMinRecoveryPointTLI = newMinRecoveryPointTLI; ereport(DEBUG2, (errmsg_internal("updated min recovery point to %X/%X on timeline %u", @@ -3137,7 +3134,6 @@ XLogNeedsFlush(XLogRecPtr record) if (!LWLockConditionalAcquire(ControlFileLock, LW_SHARED)) return true; LocalMinRecoveryPoint = ControlFile->minRecoveryPoint; - LocalMinRecoveryPointTLI = ControlFile->minRecoveryPointTLI; LWLockRelease(ControlFileLock); /* @@ -5704,12 +5700,10 @@ StartupXLOG(void) if (InArchiveRecovery) { LocalMinRecoveryPoint = ControlFile->minRecoveryPoint; - LocalMinRecoveryPointTLI = ControlFile->minRecoveryPointTLI; } else { LocalMinRecoveryPoint = InvalidXLogRecPtr; - LocalMinRecoveryPointTLI = 0; } /* Check that the GUCs used to generate the WAL allow recovery */ @@ -6197,7 +6191,6 @@ SwitchIntoArchiveRecovery(XLogRecPtr EndRecPtr, TimeLineID replayTLI) } /* update local copy */ LocalMinRecoveryPoint = ControlFile->minRecoveryPoint; - LocalMinRecoveryPointTLI = ControlFile->minRecoveryPointTLI; /* * The startup process can update its local copy of minRecoveryPoint from @@ -7764,7 +7757,6 @@ CreateRestartPoint(int flags) /* update local copy */ LocalMinRecoveryPoint = ControlFile->minRecoveryPoint; - LocalMinRecoveryPointTLI = ControlFile->minRecoveryPointTLI; } if (flags & CHECKPOINT_IS_SHUTDOWN) ControlFile->state = DB_SHUTDOWNED_IN_RECOVERY; @@ -8593,7 +8585,6 @@ xlog_redo(XLogReaderState *record) if (InArchiveRecovery) { LocalMinRecoveryPoint = ControlFile->minRecoveryPoint; - LocalMinRecoveryPointTLI = ControlFile->minRecoveryPointTLI; } if (LocalMinRecoveryPoint != InvalidXLogRecPtr && LocalMinRecoveryPoint < lsn) { diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index db45129429e..deeca26806e 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -346,8 +346,6 @@ static time_t AbortStartTime = 0; /* Length of said timeout */ #define SIGKILL_CHILDREN_AFTER_SECS 5 -static bool ReachedNormalRunning = false; /* T if we've reached PM_RUN */ - bool ClientAuthInProgress = false; /* T during new-client * authentication */ @@ -2437,7 +2435,6 @@ process_pm_child_exit(void) StartupStatus = STARTUP_NOT_RUNNING; FatalError = false; AbortStartTime = 0; - ReachedNormalRunning = true; pmState = PM_RUN; connsAllowed = true; diff --git a/src/backend/utils/adt/jsonpath_scan.l b/src/backend/utils/adt/jsonpath_scan.l index 7acda778375..23e8ca2a5bc 100644 --- a/src/backend/utils/adt/jsonpath_scan.l +++ b/src/backend/utils/adt/jsonpath_scan.l @@ -35,7 +35,6 @@ static JsonPathString scanstring; /* Handles to the buffer that the lexer uses internally */ static YY_BUFFER_STATE scanbufhandle; static char *scanbuf; -static int scanbuflen; static void addstring(bool init, char *s, int l); static void addchar(bool init, char c); @@ -493,7 +492,6 @@ jsonpath_scanner_init(const char *str, int slen) * Make a scan buffer with special termination needed by flex. */ - scanbuflen = slen; scanbuf = palloc(slen + 2); memcpy(scanbuf, str, slen); scanbuf[slen] = scanbuf[slen + 1] = YY_END_OF_BUFFER_CHAR; diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c index 7618c1bdf1c..4abebab0445 100644 --- a/src/bin/pg_dump/pg_dump_sort.c +++ b/src/bin/pg_dump/pg_dump_sort.c @@ -156,7 +156,6 @@ static const int dbObjectTypePriority[] = StaticAssertDecl(lengthof(dbObjectTypePriority) == (DO_SUBSCRIPTION_REL + 1), "array length mismatch"); -static DumpId preDataBoundId; static DumpId postDataBoundId; @@ -567,7 +566,6 @@ sortDumpableObjects(DumpableObject **objs, int numObjs, * Saving the boundary IDs in static variables is a bit grotty, but seems * better than adding them to parameter lists of subsidiary functions. */ - preDataBoundId = preBoundaryId; postDataBoundId = postBoundaryId; ordering = (DumpableObject **) pg_malloc(numObjs * sizeof(DumpableObject *)); diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c index 58e0df8874d..36c229c4864 100644 --- a/src/interfaces/libpq/fe-secure-openssl.c +++ b/src/interfaces/libpq/fe-secure-openssl.c @@ -86,7 +86,9 @@ static int my_SSL_set_fd(PGconn *conn, int fd); static bool pq_init_ssl_lib = true; +#ifdef HAVE_CRYPTO_LOCK static bool pq_init_crypto_lib = true; +#endif static bool ssl_lib_initialized = false; @@ -112,7 +114,9 @@ pgtls_init_library(bool do_ssl, int do_crypto) return; pq_init_ssl_lib = do_ssl; +#ifdef HAVE_CRYPTO_LOCK pq_init_crypto_lib = do_crypto; +#endif } PostgresPollingStatusType diff --git a/src/test/modules/test_resowner/test_resowner_many.c b/src/test/modules/test_resowner/test_resowner_many.c index 7808c9e5df3..d96dc09831c 100644 --- a/src/test/modules/test_resowner/test_resowner_many.c +++ b/src/test/modules/test_resowner/test_resowner_many.c @@ -44,10 +44,9 @@ typedef struct } ManyTestResource; /* - * Current release phase, and priority of last call to the release callback. + * Priority of last call to the release callback. * This is used to check that the resources are released in correct order. */ -static ResourceReleasePhase current_release_phase; static uint32 last_release_priority = 0; /* prototypes for local functions */ @@ -273,18 +272,15 @@ test_resowner_many(PG_FUNCTION_ARGS) /* Start releasing */ elog(NOTICE, "releasing resources before locks"); - current_release_phase = RESOURCE_RELEASE_BEFORE_LOCKS; last_release_priority = 0; ResourceOwnerRelease(resowner, RESOURCE_RELEASE_BEFORE_LOCKS, false, false); Assert(GetTotalResourceCount(before_kinds, nkinds) == 0); elog(NOTICE, "releasing locks"); - current_release_phase = RESOURCE_RELEASE_LOCKS; last_release_priority = 0; ResourceOwnerRelease(resowner, RESOURCE_RELEASE_LOCKS, false, false); elog(NOTICE, "releasing resources after locks"); - current_release_phase = RESOURCE_RELEASE_AFTER_LOCKS; last_release_priority = 0; ResourceOwnerRelease(resowner, RESOURCE_RELEASE_AFTER_LOCKS, false, false); Assert(GetTotalResourceCount(before_kinds, nkinds) == 0);