diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2018-04-02 21:34:15 +0100 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2018-04-02 21:34:15 +0100 |
| commit | 7cf8a5c302735d193dcf901b87e03e324903c632 (patch) | |
| tree | 0f9815ae865d08f20e7037c148c3078fad0138e7 /src/include/executor/spi.h | |
| parent | 354f13855e6381d288dfaa52bcd4f2cb0fd4a5eb (diff) | |
| download | postgresql-7cf8a5c302735d193dcf901b87e03e324903c632.tar.gz postgresql-7cf8a5c302735d193dcf901b87e03e324903c632.zip | |
Revert "Modified files for MERGE"
This reverts commit 354f13855e6381d288dfaa52bcd4f2cb0fd4a5eb.
Diffstat (limited to 'src/include/executor/spi.h')
| -rw-r--r-- | src/include/executor/spi.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index 78410b9f772..e5bdaecc4e3 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -64,7 +64,6 @@ typedef struct _SPI_plan *SPIPlanPtr; #define SPI_OK_REL_REGISTER 15 #define SPI_OK_REL_UNREGISTER 16 #define SPI_OK_TD_REGISTER 17 -#define SPI_OK_MERGE 18 #define SPI_OPT_NONATOMIC (1 << 0) |