Cleanups.

src/include/executor/spi.h

@@ -52,7 +52,6 @@ typedef struct {
 #define SPI_ERROR_NOATTRIBUTE	-9
 #define SPI_ERROR_NOOUTFUNC	-10
 #define SPI_ERROR_TYPUNKNOWN	-11
-#define SPI_ERROR_NOENTRY	-12
 
 #define SPI_OK_CONNECT		1
 #define SPI_OK_FINISH		2
@@ -65,24 +64,16 @@ typedef struct {
 #define SPI_OK_UPDATE		9
 #define SPI_OK_CURSOR		10
 
-#define SPI_DSPACE_LOCAL	0
-#define SPI_DSPACE_XACT		1
-#define SPI_DSPACE_SESSION	2
-
 extern uint32 SPI_processed;
 extern SPITupleTable *SPI_tuptable;
-extern int SPI_error;
+extern int SPI_result;
 
-extern int SPI_connect (char *ident);
+extern int SPI_connect (void);
 extern int SPI_finish (void);
-extern int SPI_exec (char *src);
-extern int SPI_execn (char *src, int tcount);
-extern int SPI_execp (int pid, char **values, char *Nulls);
-extern int SPI_prepare (char *src, int nargs, Oid *argtypes);
-extern int SPI_expplan (int dspace, int start, int count);
-extern int SPI_impplan (int dspace, int start, int count);
-extern int SPI_expdata (int dspace, int count, void **data, int *len);
-extern int SPI_impdata (int dspace, int start, int count, void **data, int **len);
+extern int SPI_exec (char *src, int tcount);
+extern int SPI_execp (void *plan, char **values, char *Nulls, int tcount);
+extern void *SPI_prepare (char *src, int nargs, Oid *argtypes);
+extern void *SPI_saveplan (void *plan);
 
 extern int SPI_fnumber (TupleDesc tupdesc, char *fname);
 extern char *SPI_getvalue (HeapTuple tuple, TupleDesc tupdesc, int fnumber);