diff options
| -rw-r--r-- | src/backend/executor/execMain.c | 3 | ||||
| -rw-r--r-- | src/backend/executor/execQual.c | 8 | ||||
| -rw-r--r-- | src/backend/executor/functions.c | 5 | ||||
| -rw-r--r-- | src/backend/executor/nodeAppend.c | 4 | ||||
| -rw-r--r-- | src/backend/executor/nodeHash.c | 6 | ||||
| -rw-r--r-- | src/include/storage/bufmgr.h | 5 |
6 files changed, 19 insertions, 12 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 83062cc6850..9acaf17bfe8 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -26,7 +26,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.5 1996/10/23 07:40:26 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.6 1996/10/26 04:13:05 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -37,6 +37,7 @@ #include "utils/acl.h" #include "parser/parsetree.h" /* rt_fetch() */ #include "storage/bufmgr.h" +#include "storage/lmgr.h" #include "commands/async.h" /* #include "access/localam.h" */ #include "optimizer/var.h" diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index c10c61a574d..e70c00c9837 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.6 1996/10/10 00:18:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.7 1996/10/26 04:13:11 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -918,7 +918,7 @@ ExecEvalOr(Expr *orExpr, ExprContext *econtext, bool *isNull) List *clause; bool isDone; bool IsNull; - Datum const_value; + Datum const_value = 0; IsNull = false; clauses = orExpr->args; @@ -979,7 +979,7 @@ ExecEvalAnd(Expr *andExpr, ExprContext *econtext, bool *isNull) { List *clauses; List *clause; - Datum const_value; + Datum const_value = 0; bool isDone; bool IsNull; @@ -1056,7 +1056,7 @@ ExecEvalExpr(Node *expression, bool *isNull, bool *isDone) { - Datum retDatum; + Datum retDatum = 0; *isNull = false; diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index 47baa11850a..36ac698f89d 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.2 1996/09/16 05:36:15 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.3 1996/10/26 04:13:20 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -23,6 +23,7 @@ #include "parser/parse_query.h" #include "tcop/pquery.h" #include "tcop/tcopprot.h" +#include "tcop/utility.h" #include "nodes/params.h" #include "fmgr.h" #include "utils/fcache.h" @@ -352,7 +353,7 @@ Datum postquel_function(Func *funcNode, char **args, bool *isNull, bool *isDone) { execution_state *es; - Datum result; + Datum result = 0; FunctionCachePtr fcache = funcNode->func_fcache; es = (execution_state *) fcache->func_state; diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c index 0a6cd5d01bb..3bc33526d9d 100644 --- a/src/backend/executor/nodeAppend.c +++ b/src/backend/executor/nodeAppend.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.1.1.1 1996/07/09 06:21:26 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.2 1996/10/26 04:13:26 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -171,7 +171,7 @@ ExecInitAppend(Append *node, EState *estate, Plan *parent) { AppendState *unionstate; int nplans; - List *resultList; + List *resultList = NULL; List *rtentries; List *unionplans; bool *initialized; diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c index 6a476bac59e..78f19454bac 100644 --- a/src/backend/executor/nodeHash.c +++ b/src/backend/executor/nodeHash.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.4 1996/08/19 01:52:36 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.5 1996/10/26 04:13:31 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -22,6 +22,7 @@ #include <stdio.h> /* for sprintf() */ #include <math.h> #include <sys/file.h> + #include "storage/fd.h" /* for SEEK_ */ #include "storage/ipc.h" #include "storage/bufmgr.h" /* for BLCKSZ */ @@ -29,6 +30,7 @@ #include "executor/nodeHash.h" #include "executor/nodeHashjoin.h" #include "utils/palloc.h" +#include "utils/hsearch.h" extern int NBuffers; static int HashTBSize; @@ -55,7 +57,7 @@ ExecHash(Hash *node) ExprContext *econtext; int nbatch; - File *batches; + File *batches = NULL; RelativeAddr *batchPos; int *batchSizes; int i; diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index 40a5ecdbb33..a92fe0a65df 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: bufmgr.h,v 1.3 1996/10/20 06:35:20 scrappy Exp $ + * $Id: bufmgr.h,v 1.4 1996/10/26 04:15:05 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -14,7 +14,10 @@ #define BUFMGR_H #include <stdio.h> + #include "storage/ipc.h" +#include "storage/buf.h" +#include "utils/rel.h" /* * the maximum size of a disk block for any possible installation. |