Remove added NullProc define, and use fmgr.h value from fmgr.h.
This commit is contained in:
parent
7e5f53e730
commit
68f9c9819b
|
@ -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
|
||||
|
|
|
@ -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 ));
|
||||
|
|
Loading…
Reference in New Issue