@@ -207,6 +207,7 @@ static TransactionStateData TopTransactionStateData = {
2072070 ,/* subtransaction id */
208208NULL ,/* savepoint name */
2092090 ,/* savepoint level */
210+ NULL ,/* savepoint context */
210211TRANS_DEFAULT ,/* transaction state */
211212TBLOCK_DEFAULT ,/* transaction block state from the client
212213 * perspective */
@@ -4096,7 +4097,6 @@ DefineSavepoint(char *name)
40964097 */
40974098if (name )
40984099s -> name = MemoryContextStrdup (TopTransactionContext ,name );
4099- s -> savepointContext = TM -> CreateSavepointContext ();
41004100break ;
41014101
41024102/* These cases are invalid. */
@@ -5085,6 +5085,7 @@ PushTransaction(void)
50855085GetUserIdAndSecContext (& s -> prevUser ,& s -> prevSecContext );
50865086s -> prevXactReadOnly = XactReadOnly ;
50875087s -> parallelModeLevel = 0 ;
5088+ s -> savepointContext = TM -> CreateSavepointContext ();
50885089
50895090CurrentTransactionState = s ;
50905091
@@ -5115,7 +5116,9 @@ PopTransaction(void)
51155116if (s -> parent == NULL )
51165117elog (FATAL ,"PopTransaction with no parent" );
51175118
5119+ TM -> ReleaseSavepointContext (s -> savepointContext );
51185120CurrentTransactionState = s -> parent ;
5121+ TM -> RestoreSavepointContext (CurrentTransactionState -> savepointContext );
51195122
51205123/* Let's just make sure CurTransactionContext is good */
51215124CurTransactionContext = s -> parent -> curTransactionContext ;