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

Commit 68f9c98

Browse files
committed
Remove added NullProc define, and use fmgr.h value from fmgr.h.
1 parent 7e5f53e commit 68f9c98

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/backend/access/nbtree/nbtsearch.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.34 1998/04/10 22:07:41 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.35 1998/05/13 03:44:23 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -317,7 +317,7 @@ _bt_skeycmp(Relation rel,
317317
/* see comments about NULLs handling in btbuild */
318318
if (entry->sk_flags & SK_ISNULL) /* key is NULL */
319319
{
320-
Assert(entry->sk_procedure == NullValueRegProcedure);
320+
Assert(entry->sk_procedure == F_NULLVALUE);
321321
keyNull = true;
322322
if (isNull)
323323
compare = (strat == BTEqualStrategyNumber) ? true : false;
@@ -665,7 +665,7 @@ _bt_compare(Relation rel,
665665
/* see comments about NULLs handling in btbuild */
666666
if (entry->sk_flags & SK_ISNULL) /* key is NULL */
667667
{
668-
Assert(entry->sk_procedure == NullValueRegProcedure);
668+
Assert(entry->sk_procedure == F_NULLVALUE);
669669
if (null)
670670
tmpres = (long) 0; /* NULL "=" NULL */
671671
else

src/include/catalog/pg_proc.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: pg_proc.h,v 1.57 1998/05/12 17:46:48 momjian Exp $
9+
* $Id: pg_proc.h,v 1.58 1998/05/13 03:44:24 momjian Exp $
1010
*
1111
* NOTES
1212
* The script catalog/genbki.sh reads this file and generates .bki
@@ -1225,7 +1225,6 @@ DESCR("equals");
12251225

12261226
DATA(insert OID = 1029 ( nullvalue PGUID 11 f t f 1 f 16 "0" 100 0 0 100 foo bar ));
12271227
DESCR("(internal)");
1228-
#define NullValueRegProcedure 1029
12291228
DATA(insert OID = 1030 ( nonnullvalue PGUID 11 f t f 1 f 16 "0" 100 0 0 100 foo bar ));
12301229
DESCR("(internal)");
12311230
DATA(insert OID = 1031 ( aclitemin PGUID 11 f t f 1 f 1033 "0" 100 0 0 100 foo bar ));

0 commit comments

Comments
 (0)