diff options
| author | Bruce Momjian | 1997-09-12 14:29:04 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1997-09-12 14:29:04 +0000 |
| commit | 7044dd7ec86c7288c254127879d46790acebf72d (patch) | |
| tree | 94cb16be5ec0c3d99f4b27728672ec58f87b65f2 | |
| parent | 4379ce83803c7318e3412fe356dc64412f2ed067 (diff) | |
Fix heap_getattr bug I just added.
| -rw-r--r-- | src/include/access/heapam.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index b0089161ec3..c5759c6e766 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: heapam.h,v 1.17 1997/09/12 05:58:18 momjian Exp $ + * $Id: heapam.h,v 1.18 1997/09/12 14:29:04 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -95,12 +95,13 @@ typedef HeapAccessStatisticsData *HeapAccessStatistics; * pointer to the structure describing the row and all its fields. * ---------------- */ #define heap_getattr(tup, b, attnum, tupleDesc, isnull) \ - (AssertMacro((tup) != NULL) && \ - ((attnum) > (int) (tup)->t_natts) ? \ - ((isnull && (*(isnull) = true)), (Datum)NULL) : \ - ((attnum) > 0) ? \ - fastgetattr((tup), (attnum), (tupleDesc), (isnull)) : \ - ((isnull && (*(isnull) = false)), heap_getsysattr((tup), (b), (attnum)))) + (AssertMacro((tup) != NULL) ? \ + ((attnum) > (int) (tup)->t_natts) ? \ + (((isnull) ? (*(isnull) = true) : (char)NULL), (Datum)NULL) : \ + ((attnum) > 0) ? \ + fastgetattr((tup), (attnum), (tupleDesc), (isnull)) : \ + (((isnull) ? (*(isnull) = false) : (char)NULL), heap_getsysattr((tup), (b), (attnum))) : \ + (Datum)NULL) extern HeapAccessStatistics heap_access_stats; /* in stats.c */ |