Commita69772f

committed

Merge branch 'xtm' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into xtm

2 parentsed850db +bdafca6 commita69772fCopy full SHA for a69772f

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -792,7 +792,9 @@ Datum`
`792`	`792`	`dtm_begin_transaction(PG_FUNCTION_ARGS)`
`793`	`793`	`{`
`794`	`794`	`Assert(!TransactionIdIsValid(DtmNextXid));`
`795`		`-`
	`795`	`+if (dtm==NULL) {`
	`796`	`+elog(ERROR,"DTM is not properly initialized, please check that pg_dtm plugin was added to shared_preload_libraries list in postgresql.conf");`
	`797`	`+ }`
`796`	`798`	`DtmNextXid=DtmGlobalStartTransaction(&DtmSnapshot,&dtm->minXid);`
`797`	`799`	`Assert(TransactionIdIsValid(DtmNextXid));`
`798`	`800`	`XTM_INFO("%d: Start global transaction %d, dtm->minXid=%d\n",getpid(),DtmNextXid,dtm->minXid);`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,9 @@ func main() {`
`218`	`218`	`vartransferWg sync.WaitGroup`
`219`	`219`	`varinspectWg sync.WaitGroup`
`220`	`220`
	`221`	`+fmt.Printf("preparing the database...\n")`
`221`	`222`	`prepare_db()`
	`223`	`+fmt.Printf("the database prepared\n")`
`222`	`224`
`223`	`225`	`cCommits:=make(chanint)`
`224`	`226`	`cAborts:=make(chanint)`

Comments

(0)