diff options
| -rw-r--r-- | src/backend/access/nbtree/nbtsearch.c | 6 | ||||
| -rw-r--r-- | src/include/catalog/pg_proc.h | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c index 27f07280820..d11874d56d2 100644 --- a/src/backend/access/nbtree/nbtsearch.c +++ b/src/backend/access/nbtree/nbtsearch.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.34 1998/04/10 22:07:41 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.35 1998/05/13 03:44:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -317,7 +317,7 @@ _bt_skeycmp(Relation rel, /* see comments about NULLs handling in btbuild */ if (entry->sk_flags & SK_ISNULL) /* key is NULL */ { - Assert(entry->sk_procedure == NullValueRegProcedure); + Assert(entry->sk_procedure == F_NULLVALUE); keyNull = true; if (isNull) compare = (strat == BTEqualStrategyNumber) ? true : false; @@ -665,7 +665,7 @@ _bt_compare(Relation rel, /* see comments about NULLs handling in btbuild */ if (entry->sk_flags & SK_ISNULL) /* key is NULL */ { - Assert(entry->sk_procedure == NullValueRegProcedure); + Assert(entry->sk_procedure == F_NULLVALUE); if (null) tmpres = (long) 0; /* NULL "=" NULL */ else diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index 82a76ccdbb6..e7fb38032a3 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_proc.h,v 1.57 1998/05/12 17:46:48 momjian Exp $ + * $Id: pg_proc.h,v 1.58 1998/05/13 03:44:24 momjian Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -1225,7 +1225,6 @@ DESCR("equals"); DATA(insert OID = 1029 ( nullvalue PGUID 11 f t f 1 f 16 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); -#define NullValueRegProcedure 1029 DATA(insert OID = 1030 ( nonnullvalue PGUID 11 f t f 1 f 16 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); DATA(insert OID = 1031 ( aclitemin PGUID 11 f t f 1 f 1033 "0" 100 0 0 100 foo bar )); |