Commit0108fdd

committed

Remove NULL_PATCH define

1 parent8edbc3b commit0108fddCopy full SHA for 0108fdd

File tree

-17

lines changed

-17

lines changed

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* 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 $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1234,11 +1234,9 @@ make_targetlist_expr(ParseState *pstate,`
`1234`	`1234`	`elog(WARN,"make_targetlist_expr: invalid use of NULL expression");`
`1235`	`1235`
`1236`	`1236`	`type_id=exprType(expr);`
`1237`		`-#ifdefNULL_PATCH`
`1238`	`1237`	`if (!type_id) {`
`1239`	`1238`	`type_len=0;`
`1240`	`1239`	`}else`
`1241`		`-#endif`
`1242`	`1240`	`type_len=tlen(get_id_type(type_id));`
`1243`	`1241`
`1244`	`1242`	`/* I have no idea what the following does! */`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`*`
`8`	`8`	`* 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 $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -472,10 +472,8 @@ oper(char *op, int arg1, int arg2)`
`472`	`472`	`CandidateListcandidates;`
`473`	`473`	`intncandidates;`
`474`	`474`
`475`		`-#ifdefNULL_PATCH`
`476`	`475`	`if (!arg2)arg2=arg1;`
`477`	`476`	`if (!arg1)arg1=arg2;`
`478`		`-#endif`
`479`	`477`
`480`	`478`	`if (!(tup=SearchSysCacheTuple(OPRNAME,`
`481`	`479`	`PointerGetDatum(op),`

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* 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 $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -651,11 +651,7 @@ make_const(Value *value)`
`651`	`651`
`652`	`652`	`/* null const */`
`653`	`653`	`con=makeConst(0,0, (Datum)NULL, TRUE,0, FALSE);`
`654`		`-#ifdefNULL_PATCH`
`655`	`654`	`returncon;`
`656`		`-#else`
`657`		`-returnNULL/con/;`
`658`		`-#endif`
`659`	`655`	`}`
`660`	`656`	`}`
`661`	`657`

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`*`
`8`	`8`	`* 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 $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -302,10 +302,8 @@ parser_typecast2(Node *expr, int exprType, Type tp, int typlen)`
`302`	`302`	`Assert(IsA(expr,Const));`
`303`	`303`
`304`	`304`	`switch (exprType) {`
`305`		`-#ifdefNULL_PATCH`
`306`	`305`	`case0:/* NULL */`
`307`	`306`	`break;`
`308`		`-#endif`
`309`	`307`	`case23:/* int4 */`
`310`	`308`	`const_string= (char*)palloc(256);`
`311`	`309`	`string_palloced= true;`
`@@ -356,7 +354,6 @@ parser_typecast2(Node *expr, int exprType, Type tp, int typlen)`
`356`	`354`	`elog(WARN,"unknown type%d ",exprType);`
`357`	`355`	`}`
`358`	`356`
`359`		`-#ifdefNULL_PATCH`
`360`	`357`	`if (!exprType) {`
`361`	`358`	`adt=makeConst((Oid)typeid(tp),`
`362`	`359`	`(Size)0,`
`@@ -366,7 +363,6 @@ parser_typecast2(Node *expr, int exprType, Type tp, int typlen)`
`366`	`363`	`0/* not a set */);`
`367`	`364`	`return ((Node*)adt);`
`368`	`365`	`}`
`369`		`-#endif`
`370`	`366`
`371`	`367`	`cp=instr2 (tp,const_string,typlen);`
`372`	`368`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,6 @@`
`180`	`180`
`181`	`181`	`/* found in src/backend/utils/adt/arrayfuncs.c */`
`182`	`182`	`/* #define LOARRAY */`
`183`		`-#defineNULL_PATCH`
`184`	`183`	`#defineOPENLINK_PATCHES`
`185`	`184`
`186`	`185`	`/* This is the time, in seconds, at which a given backend server`

Comments

(0)