diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/access/nbtree/nbtsearch.c | 26 | ||||
| -rwxr-xr-x | src/backend/port/aix/mkldexport.sh | 2 | ||||
| -rw-r--r-- | src/backend/utils/adt/nabstime.c | 3 |
3 files changed, 20 insertions, 11 deletions
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c index 61a26c0f7d1..9c07114bc47 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.11 1996/12/06 09:41:45 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.12 1996/12/15 09:05:10 bryanh Exp $ * *------------------------------------------------------------------------- */ @@ -27,11 +27,19 @@ #endif -static BTStack _bt_searchr(Relation rel, int keysz, ScanKey scankey, Buffer *bufP, BTStack stack_in); -static OffsetNumber _bt_firsteq(Relation rel, TupleDesc itupdesc, Page page, Size keysz, ScanKey scankey, OffsetNumber offnum); -int _bt_compare(Relation rel, TupleDesc itupdesc, Page page, int keysz, ScanKey scankey, OffsetNumber offnum); -static bool _bt_twostep(IndexScanDesc scan, Buffer *bufP, ScanDirection dir); -static RetrieveIndexResult _bt_endpoint(IndexScanDesc scan, ScanDirection dir); +static BTStack +_bt_searchr(Relation rel, int keysz, ScanKey scankey, + Buffer *bufP, BTStack stack_in); +static OffsetNumber +_bt_firsteq(Relation rel, TupleDesc itupdesc, Page page, + Size keysz, ScanKey scankey, OffsetNumber offnum); +int +_bt_compare(Relation rel, TupleDesc itupdesc, Page page, + int keysz, ScanKey scankey, OffsetNumber offnum); +static bool +_bt_twostep(IndexScanDesc scan, Buffer *bufP, ScanDirection dir); +static RetrieveIndexResult +_bt_endpoint(IndexScanDesc scan, ScanDirection dir); /* * _bt_search() -- Search for a scan key in the index. @@ -472,7 +480,7 @@ _bt_compare(Relation rel, elog(WARN, "_bt_compare: invalid comparison to high key"); } -#ifdef 0 +#if 0 /* * We just have to belive that right answer will not * break anything. I've checked code and all seems to be ok. @@ -1130,7 +1138,7 @@ _bt_endpoint(IndexScanDesc scan, ScanDirection dir) * Scanning in BackwardScanDirection is not understandable at all. * Well - new stuff. - vadim 12/06/96 */ -#ifdef 0 +#if 0 if (PageIsEmpty(page) || start > maxoff) { ItemPointerSet(current, blkno, maxoff); if (!_bt_step(scan, &buf, BackwardScanDirection)) @@ -1166,7 +1174,7 @@ _bt_endpoint(IndexScanDesc scan, ScanDirection dir) * empty why do scanning in ForwardScanDirection ??? * Well - new stuff. - vadim 12/06/96 */ -#ifdef 0 +#if 0 if (PageIsEmpty(page)) { ItemPointerSet(current, blkno, FirstOffsetNumber); if (!_bt_step(scan, &buf, ForwardScanDirection)) diff --git a/src/backend/port/aix/mkldexport.sh b/src/backend/port/aix/mkldexport.sh index 378baf92626..3447ebdf60d 100755 --- a/src/backend/port/aix/mkldexport.sh +++ b/src/backend/port/aix/mkldexport.sh @@ -17,7 +17,7 @@ # # setting this to nm -B might be better -NM = /usr/ucb/nm +NM=/usr/ucb/nm CMDNAME=`basename $0` if [ -z "$1" ]; then diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 5630b2f10c0..56ceb278be7 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -7,13 +7,14 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.7 1996/11/08 05:59:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.8 1996/12/15 09:05:35 bryanh Exp $ * *------------------------------------------------------------------------- */ #include <stdio.h> #include <ctype.h> #include <string.h> +#include <sys/timeb.h> #include <sys/types.h> #include "postgres.h" #include "access/xact.h" |