|
78 | 78 | * Portions Copyright (c) 1994, Regents of the University of California |
79 | 79 | * |
80 | 80 | * IDENTIFICATION |
81 | | - * $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplesort.c,v 1.6 2000/02/18 06:32:30 tgl Exp $ |
| 81 | + * $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplesort.c,v 1.7 2000/03/01 17:14:09 tgl Exp $ |
82 | 82 | * |
83 | 83 | *------------------------------------------------------------------------- |
84 | 84 | */ |
@@ -1632,20 +1632,16 @@ comparetup_heap(Tuplesortstate *state, const void *a, const void *b) |
1632 | 1632 | for (nkey=0;nkey<state->nKeys;nkey++) |
1633 | 1633 | { |
1634 | 1634 | ScanKeyscanKey=state->scanKeys+nkey; |
| 1635 | +AttrNumberattno=scanKey->sk_attno; |
1635 | 1636 | Datumlattr, |
1636 | 1637 | rattr; |
1637 | 1638 | boolisnull1, |
1638 | 1639 | isnull2; |
1639 | 1640 | intresult; |
1640 | 1641 |
|
1641 | | -lattr=heap_getattr(ltup, |
1642 | | -scanKey->sk_attno, |
1643 | | -tupDesc, |
1644 | | -&isnull1); |
1645 | | -rattr=heap_getattr(rtup, |
1646 | | -scanKey->sk_attno, |
1647 | | -tupDesc, |
1648 | | -&isnull2); |
| 1642 | +lattr=heap_getattr(ltup,attno,tupDesc,&isnull1); |
| 1643 | +rattr=heap_getattr(rtup,attno,tupDesc,&isnull2); |
| 1644 | + |
1649 | 1645 | if (isnull1) |
1650 | 1646 | { |
1651 | 1647 | if (!isnull2) |
|