2 files changed, 11 insertions, 0 deletions
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 308e74fc0b3..5f9e0e31113 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -417,6 +417,16 @@ SPI_rollback_and_chain(void)
 }
 
 /*
+ * SPICleanup is a no-op, kept for backwards compatibility. We rely on
+ * AtEOXact_SPI to cleanup. Extensions should not (need to) fiddle with the
+ * internal SPI state directly.
+ */
+void
+SPICleanup(void)
+{
+}
+
+/*
  * Clean up SPI state at transaction commit or abort.
  */
 void
diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h
index 7741dfbca88..7bf361874d2 100644
--- a/src/include/executor/spi.h
+++ b/src/include/executor/spi.h
@@ -164,6 +164,7 @@ extern void SPI_commit_and_chain(void);
 extern void SPI_rollback(void);
 extern void SPI_rollback_and_chain(void);
 
+extern void SPICleanup(void);
 extern void AtEOXact_SPI(bool isCommit);
 extern void AtEOSubXact_SPI(bool isCommit, SubTransactionId mySubid);
 extern bool SPI_inside_nonatomic_context(void);