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

vbwagner · vbwagner · commit 44a2e85f888e · 2018-02-07T15:45:57.000+03:00
diff --git a/contrib/in_memory/undo.c b/contrib/in_memory/undo.c
@@ -197,8 +197,16 @@ undo_xact_callback(XactEvent event, void *arg)
 
 	if (!IMXidIsValid(imxid))
 	{
-		undo_stack = NULL;
-		subxact_stack = NULL;
+		switch (event)
+		{
+			case XACT_EVENT_COMMIT:
+			case XACT_EVENT_ABORT:
+				undo_stack = NULL;
+				subxact_stack = NULL;
+				break;
+			default:
+				break;
+		}
 	}
 	else
 	{

Original file line number	Diff line number	Diff line change
`@@ -197,8 +197,16 @@ undo_xact_callback(XactEvent event, void *arg)`
`197`	`197`
`198`	`198`	`if (!IMXidIsValid(imxid))`
`199`	`199`	`{`
`200`		`- undo_stack = NULL;`
`201`		`- subxact_stack = NULL;`
	`200`	`+ switch (event)`
	`201`	`+ {`
	`202`	`+ case XACT_EVENT_COMMIT:`
	`203`	`+ case XACT_EVENT_ABORT:`
	`204`	`+ undo_stack = NULL;`
	`205`	`+ subxact_stack = NULL;`
	`206`	`+ break;`
	`207`	`+ default:`
	`208`	`+ break;`
	`209`	`+ }`
`202`	`210`	`}`
`203`	`211`	`else`
`204`	`212`	`{`