Apply 0010-Use-right-codes-for-conflictMode.-Whitespace-comment.patch

diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index 3888fd8bb6256a0f5a564f21cd710faa1ef59670..bef0df1e2532047ba4722d520c3a0647c999e15a 100644 (file)
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -1351,11 +1351,11 @@ tblspc_redo(XLogRecPtr lsn, XLogRecord *record)
                         * users because temp_tablespace parameter will just ignore
                         * tablespaces that no longer exist.
                         *
-                        * Ask everybody to cancel their queries immediately so 
+                        * Ask everybody to cancel their queries immediately so
                         * we can ensure no temp files remain and we can remove the
-                        * tablespace. Nuke the entire site from orbit, its the only
+                        * tablespace. Nuke the entire site from orbit, it's the only
                         * way to be sure.
-                        * 
+                        *
                         * XXX: We could work out the pids of active backends
                         * using this tablespace by examining the temp filenames in the
                         * directory. We would then convert the pids into VirtualXIDs

diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index c3424730bbe24c1273e11299899784dda1f86545..bef015cad2e7ceed4649863ea9c571df54a3d8d2 100644 (file)
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -1545,7 +1545,7 @@ ResolveRecoveryConflictWithVirtualXIDs(VirtualTransactionId *waitlist,
                                 */
                                switch (cancel_mode)
                                {
-                                       case FATAL:
+                                       case CONFLICT_MODE_FATAL:
                                                ereport(trace_recovery(DEBUG1),
                                                        (errmsg("recovery disconnects session with pid %d "
                                                        "because of conflict with %s (current delay %d secs)",
@@ -1553,7 +1553,7 @@ ResolveRecoveryConflictWithVirtualXIDs(VirtualTransactionId *waitlist,
                                                                reason,
                                                                currentDelay_ms / 1000)));
                                                        break;
-                                       case ERROR:
+                                       case CONFLICT_MODE_ERROR:
                                                ereport(trace_recovery(DEBUG1),
                                                        (errmsg("recovery cancels virtual transaction %u/%u pid %d "
                                                        "because of conflict with %s (current delay %d secs)",