Commit9924cd2

authored and

committed

Reset the Package->hctxRegular if package in state

"removed, but not committed yet".

1 parent49c8a93 commit9924cd2Copy full SHA for 9924cd2

File tree

+12

-1

lines changed

+12

-1

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1705,6 +1705,12 @@ SELECT pgv_free();`
`1705`	`1705`
`1706`	`1706`	`(1 row)`
`1707`	`1707`
	`1708`	`+SELECT pgv_free(); -- Check sequential package removal in one subtransaction`
	`1709`	`+ pgv_free`
	`1710`	`+----------`
	`1711`	`+`
	`1712`	`+(1 row)`
	`1713`	`+`
`1708`	`1714`	`SELECT * FROM pgv_list() ORDER BY package, name;`
`1709`	`1715`	`package \| name \| is_transactional`
`1710`	`1716`	`---------+------+------------------`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -916,7 +916,11 @@ removePackageInternal(Package *package)`
`916`	`916`	`TransObject*transObject;`
`917`	`917`
`918`	`918`	`/* All regular variables will be freed */`
`919`		`-MemoryContextDelete(package->hctxRegular);`
	`919`	`+if (package->hctxRegular)`
	`920`	`+{`
	`921`	`+MemoryContextDelete(package->hctxRegular);`
	`922`	`+package->hctxRegular=NULL;`
	`923`	`+}`
`920`	`924`
`921`	`925`	`/* Add to changes list */`
`922`	`926`	`transObject=&package->transObject;`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -425,6 +425,7 @@ SELECT pgv_set('vars', 'regular', 'regular variable exists'::text);`
`425`	`425`	`SELECT pgv_set('vars','trans1','trans1 variable exists'::text, true);`
`426`	`426`	`BEGIN;`
`427`	`427`	`SELECT pgv_free();`
	`428`	`+SELECT pgv_free();-- Check sequential package removal in one subtransaction`
`428`	`429`	`SELECT*FROM pgv_list()ORDER BY package, name;`
`429`	`430`	`SELECT pgv_set('vars','trans2','trans2 variable exists'::text, true);`
`430`	`431`	`SELECT*FROM pgv_list()ORDER BY package, name;`

Comments

(0)