Commit2e74d35

committed

Merge branch 'master' of github.com:postgrespro/postgres_cluster

2 parents746b5ff +9497fc6 commit2e74d35Copy full SHA for 2e74d35

File tree

-0

lines changed

-0

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,7 @@ static void gen_snapshot(Snapshot *s) {`
`195`	`195`	`Transaction*t;`
`196`	`196`	`intn=0;`
`197`	`197`	`s->times_sent=0;`
	`198`	`+#if0`
`198`	`199`	`for (t= (Transaction)active_transactions.prev;t!= (Transaction)&active_transactions;t= (Transaction*)t->elem.prev) {`
`199`	`200`	`/*`
`200`	`201`	`if (t->xid < s->xmin) {`
`@@ -206,6 +207,13 @@ static void gen_snapshot(Snapshot *s) {`
`206`	`207`	`*/`
`207`	`208`	`s->active[n++]=t->xid;`
`208`	`209`	`}`
	`210`	`+#else`
	`211`	`+if (!l2_list_is_empty(&active_transactions)) {`
	`212`	`+s->active[0]= ((Transaction*)active_transactions.prev)->xid;`
	`213`	`+s->active[1]= ((Transaction*)active_transactions.next)->xid;`
	`214`	`+n=2;`
	`215`	`+ }`
	`216`	`+#endif`
`209`	`217`	`s->nactive=n;`
`210`	`218`	`if (n>0) {`
`211`	`219`	`s->xmin=s->active[0];`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -231,6 +231,7 @@ int main (int argc, char* argv[])`
`231`	`231`	`if (initialize) {`
`232`	`232`	`initializeDatabase();`
`233`	`233`	`printf("%d accounts inserted\n", cfg.nAccounts);`
	`234`	`+return0;`
`234`	`235`	`}`
`235`	`236`
`236`	`237`	`time_t start =getCurrentTime();`

Comments

(0)