opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove NULL_PATCH define

This commit is contained in:
Bruce Momjian 1996-11-04 04:35:48 +00:00
parent 8edbc3bde4
commit 0108fddf13
5 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/parser/analyze.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.10 1996/11/04 04:19:41 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.11 1996/11/04 04:35:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -1234,11 +1234,9 @@ make_targetlist_expr(ParseState *pstate,
elog(WARN, "make_targetlist_expr: invalid use of NULL expression");
type_id = exprType(expr);
#ifdef NULL_PATCH
if (!type_id) {
type_len = 0;
} else
#endif
type_len = tlen(get_id_type(type_id));
/* I have no idea what the following does! */

4
src/backend/parser/catalog_utils.c
View File

@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.5 1996/10/31 05:54:27 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.6 1996/11/04 04:35:40 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -472,10 +472,8 @@ oper(char *op, int arg1, int arg2)
CandidateList candidates;
int ncandidates;
#ifdef NULL_PATCH
if (!arg2) arg2=arg1;
if (!arg1) arg1=arg2;
#endif
if (!(tup = SearchSysCacheTuple(OPRNAME,
PointerGetDatum(op),

6
src/backend/parser/parse_query.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/parse_query.c,v 1.5 1996/10/30 02:01:59 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/parse_query.c,v 1.6 1996/11/04 04:35:42 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -651,11 +651,7 @@ make_const(Value *value)
/* null const */
con = makeConst(0, 0, (Datum)NULL, TRUE, 0, FALSE);
#ifdef NULL_PATCH
return con;
#else
return NULL /*con*/;
#endif
}
}

6
src/backend/parser/parser.c
View File

@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.3 1996/10/31 11:09:44 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.4 1996/11/04 04:35:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -302,10 +302,8 @@ parser_typecast2(Node *expr, int exprType, Type tp, int typlen)
Assert(IsA(expr,Const));
switch (exprType) {
#ifdef NULL_PATCH
case 0: /* NULL */
break;
#endif
case 23: /* int4 */
const_string = (char *) palloc(256);
string_palloced = true;
@ -356,7 +354,6 @@ parser_typecast2(Node *expr, int exprType, Type tp, int typlen)
elog(WARN,"unknown type%d ",exprType);
}
#ifdef NULL_PATCH
if (!exprType) {
adt = makeConst((Oid)typeid(tp),
(Size) 0,
@ -366,7 +363,6 @@ parser_typecast2(Node *expr, int exprType, Type tp, int typlen)
0 /* not a set */);
return ((Node*) adt);
}
#endif
cp = instr2 (tp, const_string, typlen);

1
src/include/config.h
View File

@ -180,7 +180,6 @@
/* found in src/backend/utils/adt/arrayfuncs.c */
/* #define LOARRAY */
#define NULL_PATCH
#define OPENLINK_PATCHES
/* This is the time, in seconds, at which a given backend server