Fix couple of compiler warnings

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 5a220af431df23f1d5bd279f29162abd3b617bb2..046eb9b8692f5845a255fff3ab1e89ee94acce9f 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -5639,7 +5639,6 @@ recoveryStopsBefore(XLogReaderState *record)
 #ifdef PGXC
        bool            stopsAtThisBarrier = false;
        char            *recordBarrierId = NULL;
-       uint8           record_info;
 #endif
        bool            stopsHere = false;
        uint8           xact_info;
@@ -5730,8 +5729,7 @@ recoveryStopsBefore(XLogReaderState *record)
        } /* end if (XLogRecGetRmid(record) == RM_XACT_ID) */
        else if (XLogRecGetRmid(record) == RM_BARRIER_ID)
        {
-               record_info = XLogRecGetInfo(record);
-               if (record_info == XLOG_BARRIER_CREATE)
+               if (XLogRecGetInfo(record) == XLOG_BARRIER_CREATE)
                {
                        recordBarrierId = (char *) XLogRecGetData(record);
                        ereport(DEBUG2,
@@ -5758,8 +5756,11 @@ recoveryStopsBefore(XLogReaderState *record)
        if (recoveryTarget == RECOVERY_TARGET_BARRIER)
        {
                stopsHere = false;
+               recordXid = InvalidTransactionId;       /* keep compiler quiet */
+               isCommit = false;                                       /* keep compiler quiet */
+
                if ((XLogRecGetRmid(record) == RM_BARRIER_ID) &&
-                       (record_info == XLOG_BARRIER_CREATE))
+                       (XLogRecGetInfo(record) == XLOG_BARRIER_CREATE))
                {
                        ereport(DEBUG2,
                                        (errmsg("checking if barrier record (%s) matches the target "

diff --git a/src/gtm/main/gtm_txn.c b/src/gtm/main/gtm_txn.c
index 62410e14661de8bbe8765ef37e220d664263e74a..198e2d8132aeea68f4468f1893874b96b94cd533 100644 (file)
--- a/src/gtm/main/gtm_txn.c
+++ b/src/gtm/main/gtm_txn.c
@@ -1435,7 +1435,7 @@ GTM_CommitTransaction(GTM_TransactionHandle txn, int waited_xid_count,
 static int
 GTM_PrepareTransaction(GTM_TransactionHandle txn)
 {
-       int     state;
+       int     state PG_USED_FOR_ASSERTS_ONLY;
        GTM_TransactionInfo *gtm_txninfo = NULL;
 
        gtm_txninfo = GTM_HandleToTransactionInfo(txn);