From 85ea93384ae21ff59f5e5b292884a86f9c10b852 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Tue, 14 Jun 2011 15:16:36 +0300 Subject: [PATCH] Oops, forgot to change the order of entries in 2PC callback arrays when I renumbered the resource managers. This should fix the buildfarm.. --- src/backend/access/transam/twophase_rmgr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/backend/access/transam/twophase_rmgr.c b/src/backend/access/transam/twophase_rmgr.c index 47c15af241..bbfec0da69 100644 --- a/src/backend/access/transam/twophase_rmgr.c +++ b/src/backend/access/transam/twophase_rmgr.c @@ -25,34 +25,34 @@ const TwoPhaseCallback twophase_recover_callbacks[TWOPHASE_RM_MAX_ID + 1] = { NULL, /* END ID */ lock_twophase_recover, /* Lock */ - predicatelock_twophase_recover, /* PredicateLock */ NULL, /* pgstat */ - multixact_twophase_recover /* MultiXact */ + multixact_twophase_recover, /* MultiXact */ + predicatelock_twophase_recover /* PredicateLock */ }; const TwoPhaseCallback twophase_postcommit_callbacks[TWOPHASE_RM_MAX_ID + 1] = { NULL, /* END ID */ lock_twophase_postcommit, /* Lock */ - NULL, /* PredicateLock */ pgstat_twophase_postcommit, /* pgstat */ - multixact_twophase_postcommit /* MultiXact */ + multixact_twophase_postcommit, /* MultiXact */ + NULL /* PredicateLock */ }; const TwoPhaseCallback twophase_postabort_callbacks[TWOPHASE_RM_MAX_ID + 1] = { NULL, /* END ID */ lock_twophase_postabort, /* Lock */ - NULL, /* PredicateLock */ pgstat_twophase_postabort, /* pgstat */ - multixact_twophase_postabort /* MultiXact */ + multixact_twophase_postabort, /* MultiXact */ + NULL /* PredicateLock */ }; const TwoPhaseCallback twophase_standby_recover_callbacks[TWOPHASE_RM_MAX_ID + 1] = { NULL, /* END ID */ lock_twophase_standby_recover, /* Lock */ - NULL, /* PredicateLock */ NULL, /* pgstat */ - NULL /* MultiXact */ + NULL, /* MultiXact */ + NULL /* PredicateLock */ }; -- 2.40.0