Commit18174da

authored

Merge pull request#40 from postgrespro/master

Merge branch master into stable

2 parents4eecd44 +d965593 commit18174daCopy full SHA for 18174da

File tree

+18

-0

lines changed

+18

-0

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3829,3 +3829,8 @@ SELECT pgv_free();`
`3829`	`3829`
`3830`	`3830`	`(1 row)`
`3831`	`3831`
	`3832`	`+--`
	`3833`	`+-- Test case for issue #38 [PGPRO-4676]`
	`3834`	`+--`
	`3835`	`+SELECT pgv_insert('test', 'x5', ROW ((2::int, 1::int)), TRUE);`
	`3836`	`+ERROR: could not identify a hash function for type record`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2116,6 +2116,13 @@ rollbackSavepoint(TransObject *object, TransObjectType type)`
`2116`	`2116`	`{`
`2117`	`2117`	`TransState*state;`
`2118`	`2118`
	`2119`	`+/* Nothing to do here if trans object was removed already. */`
	`2120`	`+if (dlist_is_empty(&object->states))`
	`2121`	`+{`
	`2122`	`+removeObject(object,type);`
	`2123`	`+return;`
	`2124`	`+}`
	`2125`	`+`
`2119`	`2126`	`state=GetActualState(object);`
`2120`	`2127`	`removeState(object,type,state);`
`2121`	`2128`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1163,3 +1163,9 @@ SELECT pgv_insert('vars', 'r2', tab) FROM tab;`
`1163`	`1163`	`SELECT pgv_select('vars','r2');`
`1164`	`1164`
`1165`	`1165`	`SELECT pgv_free();`
	`1166`	`+`
	`1167`	`+`
	`1168`	`+--`
	`1169`	`+-- Test case for issue #38 [PGPRO-4676]`
	`1170`	`+--`
	`1171`	`+SELECT pgv_insert('test','x5', ROW ((2::int,1::int)), TRUE);`

Comments

(0)