diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c
index c0b1376073f2ff6b68d37ed7b190947c8cfa9a31..a39793bc6912787499ad0db827ef280b3bbf5705 100644
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.7 1996/11/08 20:45:42 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.8 1996/11/10 02:23:15 bryanh Exp $
*
*-------------------------------------------------------------------------
*/
@@ -49,8 +49,8 @@ List *parsetree = NIL;
#ifdef SETS_FIXED
static void fixupsets();
-#endif
static void define_sets();
+#endif
/*
* parser-- returns a list of parse trees
*
@@ -120,6 +120,7 @@ fixupsets(Query *parse)
}
#endif
+#ifdef SETS_FIXED
/* Recursively find all of the Consts in the parsetree. Some of
* these may represent a set. The value of the Const will be the
* query (a string) which defines the set. Call SetDefine to define
@@ -128,7 +129,6 @@ fixupsets(Query *parse)
static void
define_sets(Node *clause)
{
-#ifdef SETS_FIXED
Oid setoid;
Type t = type("oid");
Oid typeoid = typeid(t);
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index b845a9ac9575647a2bbcbcf9c364b04f22dfebb0..269e643ee3527bf73b309ce9285e5d24142bad57 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.21 1996/11/08 05:57:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.22 1996/11/10 02:24:12 bryanh Exp $
*
* NOTES
*
@@ -1170,8 +1170,8 @@ dumpstatus(SIGNAL_ARGS)
fprintf(stderr, "%s: dumpstatus:\n", progname);
fprintf(stderr, "\tsock %d: nBytes=%d, laddr=0x%lx, raddr=0x%lx\n",
port->sock, port->nBytes,
- port->laddr.sin_addr.s_addr,
- port->raddr.sin_addr.s_addr);
+ (long int) port->laddr.sin_addr.s_addr,
+ (long int) port->raddr.sin_addr.s_addr);
curr = DLGetSucc(curr);
}
}
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 8d30dcc3cafebed616aaec4580945fe5ec19ec46..c146dcd97134c64783e92d04bd6678a52fc7d7e6 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.15 1996/11/08 05:59:31 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.16 1996/11/10 02:25:15 bryanh Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -1256,7 +1256,7 @@ PostgresMain(int argc, char *argv[])
*/
if (IsUnderPostmaster == false) {
puts("\nPOSTGRES backend interactive interface");
- puts("$Revision: 1.15 $ $Date: 1996/11/08 05:59:31 $");
+ puts("$Revision: 1.16 $ $Date: 1996/11/10 02:25:15 $");
}
/* ----------------
@@ -1509,42 +1509,45 @@ ShowUsage()
fprintf(StatFp, "! system usage stats:\n");
fprintf(StatFp,
- "!\t%ld.%06ld elapsed %ld.%06ld user %ld.%06ld system sec\n",
- elapse_t.tv_sec - Save_t.tv_sec,
- elapse_t.tv_usec - Save_t.tv_usec,
- r.ru_utime.tv_sec - Save_r.ru_utime.tv_sec,
- r.ru_utime.tv_usec - Save_r.ru_utime.tv_usec,
- r.ru_stime.tv_sec - Save_r.ru_stime.tv_sec,
- r.ru_stime.tv_usec - Save_r.ru_stime.tv_usec);
+ "!\t%ld.%06ld elapsed %ld.%06ld user %ld.%06ld system sec\n",
+ (long int) elapse_t.tv_sec - Save_t.tv_sec,
+ (long int) elapse_t.tv_usec - Save_t.tv_usec,
+ (long int) r.ru_utime.tv_sec - Save_r.ru_utime.tv_sec,
+ (long int) r.ru_utime.tv_usec - Save_r.ru_utime.tv_usec,
+ (long int) r.ru_stime.tv_sec - Save_r.ru_stime.tv_sec,
+ (long int) r.ru_stime.tv_usec - Save_r.ru_stime.tv_usec);
fprintf(StatFp,
- "!\t[%ld.%06ld user %ld.%06ld sys total]\n",
- user.tv_sec, user.tv_usec, sys.tv_sec, sys.tv_usec);
+ "!\t[%ld.%06ld user %ld.%06ld sys total]\n",
+ (long int) user.tv_sec,
+ (long int) user.tv_usec,
+ (long int) sys.tv_sec,
+ (long int) sys.tv_usec);
#ifndef NEED_RUSAGE
fprintf(StatFp,
- "!\t%ld/%ld [%ld/%ld] filesystem blocks in/out\n",
- r.ru_inblock - Save_r.ru_inblock,
- /* they only drink coffee at dec */
- r.ru_oublock - Save_r.ru_oublock,
- r.ru_inblock, r.ru_oublock);
+ "!\t%ld/%ld [%ld/%ld] filesystem blocks in/out\n",
+ r.ru_inblock - Save_r.ru_inblock,
+ /* they only drink coffee at dec */
+ r.ru_oublock - Save_r.ru_oublock,
+ r.ru_inblock, r.ru_oublock);
fprintf(StatFp,
- "!\t%ld/%ld [%ld/%ld] page faults/reclaims, %ld [%ld] swaps\n",
- r.ru_majflt - Save_r.ru_majflt,
- r.ru_minflt - Save_r.ru_minflt,
- r.ru_majflt, r.ru_minflt,
- r.ru_nswap - Save_r.ru_nswap,
- r.ru_nswap);
+ "!\t%ld/%ld [%ld/%ld] page faults/reclaims, %ld [%ld] swaps\n",
+ r.ru_majflt - Save_r.ru_majflt,
+ r.ru_minflt - Save_r.ru_minflt,
+ r.ru_majflt, r.ru_minflt,
+ r.ru_nswap - Save_r.ru_nswap,
+ r.ru_nswap);
fprintf(StatFp,
- "!\t%ld [%ld] signals rcvd, %ld/%ld [%ld/%ld] messages rcvd/sent\n",
- r.ru_nsignals - Save_r.ru_nsignals,
- r.ru_nsignals,
- r.ru_msgrcv - Save_r.ru_msgrcv,
- r.ru_msgsnd - Save_r.ru_msgsnd,
- r.ru_msgrcv, r.ru_msgsnd);
+ "!\t%ld [%ld] signals rcvd, %ld/%ld [%ld/%ld] messages rcvd/sent\n",
+ r.ru_nsignals - Save_r.ru_nsignals,
+ r.ru_nsignals,
+ r.ru_msgrcv - Save_r.ru_msgrcv,
+ r.ru_msgsnd - Save_r.ru_msgsnd,
+ r.ru_msgrcv, r.ru_msgsnd);
fprintf(StatFp,
- "!\t%ld/%ld [%ld/%ld] voluntary/involuntary context switches\n",
- r.ru_nvcsw - Save_r.ru_nvcsw,
- r.ru_nivcsw - Save_r.ru_nivcsw,
- r.ru_nvcsw, r.ru_nivcsw);
+ "!\t%ld/%ld [%ld/%ld] voluntary/involuntary context switches\n",
+ r.ru_nvcsw - Save_r.ru_nvcsw,
+ r.ru_nivcsw - Save_r.ru_nivcsw,
+ r.ru_nvcsw, r.ru_nivcsw);
#endif /* NEED_RUSAGE */
fprintf(StatFp, "! postgres usage stats:\n");
PrintBufferUsage(StatFp);
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 13bf1a506a691d4e0c5ecd0b41cfd42412d26833..89135b9cde274fff24b33e1a2c6d3fa8ee214e39 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.6 1996/11/08 05:59:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.7 1996/11/10 02:25:16 bryanh Exp $
*
*-------------------------------------------------------------------------
*/
@@ -42,6 +42,7 @@
#include "rewrite/rewriteDefine.h"
#include "tcop/tcopdebug.h"
#include "tcop/dest.h"
+#include "fmgr.h" /* For load_file() */
#ifndef NO_SECURITY
#include "miscadmin.h"
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index e835d9451d6d5d9460c9a5664d6f1852e5847605..a0f675f655b6439e4249d2266403f0f194f3ffb3 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.1.1.1 1996/07/09 06:22:07 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.2 1996/11/10 02:26:15 bryanh Exp $
*
*-------------------------------------------------------------------------
*/
@@ -184,7 +184,7 @@ handle_load(char *filename, char *funcname)
file_scanner->handle = pg_dlopen(filename);
if (file_scanner->handle == (void *)NULL) {
- load_error = pg_dlerror();
+ load_error = (char *) pg_dlerror();
if (file_scanner == file_list) {
file_list = (DynamicFileList *) NULL;
} else {
diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h
index fd35af13e45e40fca2aefe7cfc7525fdaf589bdd..2ae8c15f76fd9d028b5be07bb5ae7959df16e855 100644
--- a/src/include/commands/defrem.h
+++ b/src/include/commands/defrem.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: defrem.h,v 1.3 1996/11/06 07:50:12 scrappy Exp $
+ * $Id: defrem.h,v 1.4 1996/11/10 02:27:15 bryanh Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,7 +33,7 @@ extern void RemoveIndex(char *name);
/*
* prototypes in define.c
*/
-extern void DefineFunction(ProcedureStmt *nameargsexe, CommandDest dest);
+extern void CreateFunction(ProcedureStmt *stmt, CommandDest dest);
extern void DefineOperator(char *name, List *parameters);
extern void DefineAggregate(char *name, List *parameters);
extern void DefineType(char *name, List *parameters);