Merge pull request #40 from postgrespro/master

Merge branch master into stable

Author: ziva777

expected/pg_variables_trans.out

@@ -3829,3 +3829,8 @@ SELECT pgv_free();
 
 (1 row)
 
+--
+-- Test case for issue #38 [PGPRO-4676]
+--
+SELECT pgv_insert('test', 'x5', ROW ((2::int, 1::int)), TRUE);
+ERROR:  could not identify a hash function for type record

pg_variables.c

@@ -2116,6 +2116,13 @@ rollbackSavepoint(TransObject *object, TransObjectType type)
 {
 	TransState *state;
 
+	/* Nothing to do here if trans object was removed already. */
+	if (dlist_is_empty(&object->states))
+	{
+		removeObject(object, type);
+		return;
+	}
+
 	state = GetActualState(object);
 	removeState(object, type, state);
 

sql/pg_variables_trans.sql

@@ -1163,3 +1163,9 @@ SELECT pgv_insert('vars', 'r2', tab) FROM tab;
 SELECT pgv_select('vars', 'r2');
 
 SELECT pgv_free();
+
+
+--
+-- Test case for issue #38 [PGPRO-4676]
+--
+SELECT pgv_insert('test', 'x5', ROW ((2::int, 1::int)), TRUE);