restore spi internal xact mode to previous

Signed-off-by: Tanzeel Khan <[email protected]>
babelfish-for-postgresql · Dec 26, 2023 · a57ed14 · a57ed14
1 parent f2b07e3
commit a57ed14
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/contrib/babelfishpg_tsql/src/iterative_exec.c b/contrib/babelfishpg_tsql/src/iterative_exec.c
@@ -1306,13 +1306,16 @@ dispatch_stmt_handle_error(PLtsql_execstate *estate,
 			{
 				if (is_part_of_pltsql_trycatch_block(estate))
 				{
+					bool 	spi_current_internal_xact_mode;
+
 					HOLD_INTERRUPTS();
 					elog(DEBUG1, "TSQL TXN PG semantics : Rollback current transaction");
 					HoldPinnedPortals();
+					SPI_getCurrentInternalTxnMode(&spi_current_internal_xact_mode);
 					SPI_setCurrentInternalTxnMode(true);
 					AbortCurrentTransaction();
 					StartTransactionCommand();
-					SPI_setCurrentInternalTxnMode(false);
+					SPI_setCurrentInternalTxnMode(spi_current_internal_xact_mode);
 					MemoryContextSwitchTo(cur_ctxt);
 					RESUME_INTERRUPTS();
 				}

diff --git a/contrib/babelfishpg_tsql/src/pl_handler.c b/contrib/babelfishpg_tsql/src/pl_handler.c
@@ -4252,7 +4252,7 @@ pltsql_call_handler(PG_FUNCTION_ARGS)
 	PLtsql_execstate *save_cur_estate;
 	Datum		retval;
 	int			rc;
-	int			save_nestlevel;
+	int			save_nestlevel = PltsqlGUCNestLevel;
 	int			scope_level;
 	MemoryContext savedPortalCxt;
 	bool		support_tsql_trans = pltsql_support_tsql_transactions();