Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 0108fdd

Browse files
committed
Remove NULL_PATCH define
1 parent 8edbc3b commit 0108fdd

File tree

5 files changed

+4
-17
lines changed

5 files changed

+4
-17
lines changed

src/backend/parser/analyze.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.10 1996/11/04 04:19:41 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.11 1996/11/04 04:35:39 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1234,11 +1234,9 @@ make_targetlist_expr(ParseState *pstate,
12341234
elog(WARN, "make_targetlist_expr: invalid use of NULL expression");
12351235

12361236
type_id = exprType(expr);
1237-
#ifdef NULL_PATCH
12381237
if (!type_id) {
12391238
type_len = 0;
12401239
} else
1241-
#endif
12421240
type_len = tlen(get_id_type(type_id));
12431241

12441242
/* I have no idea what the following does! */

src/backend/parser/catalog_utils.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.5 1996/10/31 05:54:27 momjian Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.6 1996/11/04 04:35:40 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -472,10 +472,8 @@ oper(char *op, int arg1, int arg2)
472472
CandidateList candidates;
473473
int ncandidates;
474474

475-
#ifdef NULL_PATCH
476475
if (!arg2) arg2=arg1;
477476
if (!arg1) arg1=arg2;
478-
#endif
479477

480478
if (!(tup = SearchSysCacheTuple(OPRNAME,
481479
PointerGetDatum(op),

src/backend/parser/parse_query.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/parse_query.c,v 1.5 1996/10/30 02:01:59 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/parse_query.c,v 1.6 1996/11/04 04:35:42 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -651,11 +651,7 @@ make_const(Value *value)
651651

652652
/* null const */
653653
con = makeConst(0, 0, (Datum)NULL, TRUE, 0, FALSE);
654-
#ifdef NULL_PATCH
655654
return con;
656-
#else
657-
return NULL /*con*/;
658-
#endif
659655
}
660656
}
661657

src/backend/parser/parser.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.3 1996/10/31 11:09:44 scrappy Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.4 1996/11/04 04:35:43 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -302,10 +302,8 @@ parser_typecast2(Node *expr, int exprType, Type tp, int typlen)
302302
Assert(IsA(expr,Const));
303303

304304
switch (exprType) {
305-
#ifdef NULL_PATCH
306305
case 0: /* NULL */
307306
break;
308-
#endif
309307
case 23: /* int4 */
310308
const_string = (char *) palloc(256);
311309
string_palloced = true;
@@ -356,7 +354,6 @@ parser_typecast2(Node *expr, int exprType, Type tp, int typlen)
356354
elog(WARN,"unknown type%d ",exprType);
357355
}
358356

359-
#ifdef NULL_PATCH
360357
if (!exprType) {
361358
adt = makeConst((Oid)typeid(tp),
362359
(Size) 0,
@@ -366,7 +363,6 @@ parser_typecast2(Node *expr, int exprType, Type tp, int typlen)
366363
0 /* not a set */);
367364
return ((Node*) adt);
368365
}
369-
#endif
370366

371367
cp = instr2 (tp, const_string, typlen);
372368

src/include/config.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@
180180

181181
/* found in src/backend/utils/adt/arrayfuncs.c */
182182
/* #define LOARRAY */
183-
#define NULL_PATCH
184183
#define OPENLINK_PATCHES
185184

186185
/* This is the time, in seconds, at which a given backend server

0 commit comments

Comments
 (0)