Back-patch fix for renaming asyncCommitLSN to asyncXactLSN.

AIUI this was supposed to go into 9.0 as well as HEAD.

diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index a74727eddd06633e0d3a5e2b9e3b0a16a0bc8b3c..9dead8a92b891fe11368625fbdb925cf199972c2 100644 (file)
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.293.2.1 2010/07/23 00:43:09 rhaas Exp $
+ *       $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.293.2.2 2010/08/01 23:07:04 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1086,7 +1086,7 @@ RecordTransactionCommit(void)
                 * Report the latest async commit LSN, so that the WAL writer knows to
                 * flush this commit.
                 */
-               XLogSetAsyncCommitLSN(XactLastRecEnd);
+               XLogSetAsyncXactLSN(XactLastRecEnd);
 
                /*
                 * We must not immediately update the CLOG, since we didn't flush the
@@ -1384,7 +1384,7 @@ RecordTransactionAbort(bool isSubXact)
         * problems occur at that point.
         */
        if (!isSubXact)
-               XLogSetAsyncCommitLSN(XactLastRecEnd);
+               XLogSetAsyncXactLSN(XactLastRecEnd);
 
        /*
         * Mark the transaction aborted in clog.  This is not absolutely necessary

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 7fbccc535052763475eefc5ccad22df84b652501..12e99dbcff1d980e4dbade27f2f859f979431c22 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.430 2010/07/06 19:18:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.430.2.1 2010/08/01 23:07:04 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -362,7 +362,7 @@ typedef struct XLogCtlData
        XLogwrtResult LogwrtResult;
        uint32          ckptXidEpoch;   /* nextXID & epoch of latest checkpoint */
        TransactionId ckptXid;
-       XLogRecPtr      asyncCommitLSN; /* LSN of newest async commit */
+       XLogRecPtr      asyncXactLSN; /* LSN of newest async commit/abort */
        uint32          lastRemovedLog; /* latest removed/recycled XLOG segment */
        uint32          lastRemovedSeg;
 
@@ -1874,18 +1874,18 @@ XLogWrite(XLogwrtRqst WriteRqst, bool flexible, bool xlog_switch)
 }
 
 /*
- * Record the LSN for an asynchronous transaction commit.
- * (This should not be called for aborts, nor for synchronous commits.)
+ * Record the LSN for an asynchronous transaction commit/abort.
+ * (This should not be called for for synchronous commits.)
  */
 void
-XLogSetAsyncCommitLSN(XLogRecPtr asyncCommitLSN)
+XLogSetAsyncXactLSN(XLogRecPtr asyncXactLSN)
 {
        /* use volatile pointer to prevent code rearrangement */
        volatile XLogCtlData *xlogctl = XLogCtl;
 
        SpinLockAcquire(&xlogctl->info_lck);
-       if (XLByteLT(xlogctl->asyncCommitLSN, asyncCommitLSN))
-               xlogctl->asyncCommitLSN = asyncCommitLSN;
+       if (XLByteLT(xlogctl->asyncXactLSN, asyncXactLSN))
+               xlogctl->asyncXactLSN = asyncXactLSN;
        SpinLockRelease(&xlogctl->info_lck);
 }
 
@@ -2134,7 +2134,7 @@ XLogBackgroundFlush(void)
                volatile XLogCtlData *xlogctl = XLogCtl;
 
                SpinLockAcquire(&xlogctl->info_lck);
-               WriteRqstPtr = xlogctl->asyncCommitLSN;
+               WriteRqstPtr = xlogctl->asyncXactLSN;
                SpinLockRelease(&xlogctl->info_lck);
                flexible = false;               /* ensure it all gets written */
        }

diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h
index 27e7f404d8dc15b09a42f329eda3c31cb41f2f02..47e2268bad87bc292501285ce2f516f0b6bcb2ac 100644 (file)
--- a/src/include/access/xlog.h
+++ b/src/include/access/xlog.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.114 2010/07/03 20:43:58 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.114.2.1 2010/08/01 23:07:05 tgl Exp $
  */
 #ifndef XLOG_H
 #define XLOG_H
@@ -271,7 +271,7 @@ extern int  XLogFileOpen(uint32 log, uint32 seg);
 
 
 extern void XLogGetLastRemoved(uint32 *log, uint32 *seg);
-extern void XLogSetAsyncCommitLSN(XLogRecPtr record);
+extern void XLogSetAsyncXactLSN(XLogRecPtr record);
 
 extern void RestoreBkpBlocks(XLogRecPtr lsn, XLogRecord *record, bool cleanup);