|
8 | 8 | * |
9 | 9 | * |
10 | 10 | * IDENTIFICATION |
11 | | - * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.44 2000/04/12 17:15:48 momjian Exp $ |
| 11 | + * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.44.2.1 2000/10/19 20:52:35 tgl Exp $ |
12 | 12 | * |
13 | 13 | *------------------------------------------------------------------------- |
14 | 14 | */ |
@@ -495,13 +495,23 @@ time_cmp(TimeADT *time1, TimeADT *time2) |
495 | 495 | TimeADT* |
496 | 496 | time_larger(TimeADT*time1,TimeADT*time2) |
497 | 497 | { |
498 | | -returntime_gt(time1,time2) ?time1 :time2; |
| 498 | +TimeADT*result; |
| 499 | + |
| 500 | +/* nodeAgg.c expects me to return a copied datum! */ |
| 501 | +result=palloc(sizeof(*result)); |
| 502 | +*result=time_gt(time1,time2) ?*time1 :*time2; |
| 503 | +returnresult; |
499 | 504 | }/* time_larger() */ |
500 | 505 |
|
501 | 506 | TimeADT* |
502 | 507 | time_smaller(TimeADT*time1,TimeADT*time2) |
503 | 508 | { |
504 | | -returntime_lt(time1,time2) ?time1 :time2; |
| 509 | +TimeADT*result; |
| 510 | + |
| 511 | +/* nodeAgg.c expects me to return a copied datum! */ |
| 512 | +result=palloc(sizeof(*result)); |
| 513 | +*result=time_lt(time1,time2) ?*time1 :*time2; |
| 514 | +returnresult; |
505 | 515 | }/* time_smaller() */ |
506 | 516 |
|
507 | 517 | /* overlaps_time() |
@@ -742,13 +752,23 @@ timetz_cmp(TimeTzADT *time1, TimeTzADT *time2) |
742 | 752 | TimeTzADT* |
743 | 753 | timetz_larger(TimeTzADT*time1,TimeTzADT*time2) |
744 | 754 | { |
745 | | -returntimetz_gt(time1,time2) ?time1 :time2; |
| 755 | +TimeTzADT*result; |
| 756 | + |
| 757 | +/* nodeAgg.c expects me to return a copied datum! */ |
| 758 | +result=palloc(sizeof(*result)); |
| 759 | +*result=timetz_gt(time1,time2) ?*time1 :*time2; |
| 760 | +returnresult; |
746 | 761 | }/* timetz_larger() */ |
747 | 762 |
|
748 | 763 | TimeTzADT* |
749 | 764 | timetz_smaller(TimeTzADT*time1,TimeTzADT*time2) |
750 | 765 | { |
751 | | -returntimetz_lt(time1,time2) ?time1 :time2; |
| 766 | +TimeTzADT*result; |
| 767 | + |
| 768 | +/* nodeAgg.c expects me to return a copied datum! */ |
| 769 | +result=palloc(sizeof(*result)); |
| 770 | +*result=timetz_lt(time1,time2) ?*time1 :*time2; |
| 771 | +returnresult; |
752 | 772 | }/* timetz_smaller() */ |
753 | 773 |
|
754 | 774 | /* overlaps_timetz() |
|