diff options
| author | Bruce Momjian <bruce@momjian.us> | 2003-09-07 04:37:13 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2003-09-07 04:37:13 +0000 |
| commit | c40ed5131948495a30caac2efff7927b673cd2d0 (patch) | |
| tree | 4ee7a43fa571f53a370e60d0be421f4c6927c97f /src/backend/nodes/copyfuncs.c | |
| parent | 432ca9116bc51f6cfe6e88be33dbe6cb078cda9d (diff) | |
Update this branch to match CVS head, includes WIN32 improvements.
Diffstat (limited to 'src/backend/nodes/copyfuncs.c')
| -rw-r--r-- | src/backend/nodes/copyfuncs.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index fa1c567df0d..e77fee6417f 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -15,7 +15,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.263 2003/08/08 21:41:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.263.2.1 2003/09/07 04:36:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -947,7 +947,7 @@ _copyArrayExpr(ArrayExpr *from) COPY_SCALAR_FIELD(array_typeid); COPY_SCALAR_FIELD(element_typeid); COPY_NODE_FIELD(elements); - COPY_SCALAR_FIELD(ndims); + COPY_SCALAR_FIELD(multidims); return newnode; } @@ -1402,11 +1402,12 @@ _copyTypeName(TypeName *from) return newnode; } -static SortGroupBy * -_copySortGroupBy(SortGroupBy *from) +static SortBy * +_copySortBy(SortBy *from) { - SortGroupBy *newnode = makeNode(SortGroupBy); + SortBy *newnode = makeNode(SortBy); + COPY_SCALAR_FIELD(sortby_kind); COPY_NODE_FIELD(useOp); COPY_NODE_FIELD(node); @@ -2924,8 +2925,8 @@ copyObject(void *from) case T_TypeCast: retval = _copyTypeCast(from); break; - case T_SortGroupBy: - retval = _copySortGroupBy(from); + case T_SortBy: + retval = _copySortBy(from); break; case T_RangeSubselect: retval = _copyRangeSubselect(from); |