summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernd Helmle2011-06-14 14:50:50 +0000
committerBernd Helmle2011-06-14 14:50:50 +0000
commit74375c8a693ff03da416b0df95b02831f4812c01 (patch)
tree5bc6940ecc20f7e1b99dbfe10544064f6b4e3c75
parenta84046d724aedec5d8ef88e793efa3733f9c52da (diff)
parent85ea93384ae21ff59f5e5b292884a86f9c10b852 (diff)
Merge branch 'master' of ../bernd_pg into notnull_constraint
-rw-r--r--src/backend/access/transam/twophase_rmgr.c16
1 files 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 */
};