summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2000-01-26 05:58:53 +0000
committerBruce Momjian2000-01-26 05:58:53 +0000
commit8782a8be9361a1fbebbd1620f60c4df1b60b206b (patch)
treeb6024d3b2e85d871cbe8ecafa270511f7dd098c8
parent9a8e7e99895db9ec09ab129aa48c675920097729 (diff)
Add:
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc to all files copyright Regents of Berkeley. Man, that's a lot of files.
-rw-r--r--contrib/os2client/c.h3
-rw-r--r--contrib/vacuumlo/vacuumlo.c3
-rw-r--r--src/backend/access/common/heaptuple.c3
-rw-r--r--src/backend/access/common/indextuple.c3
-rw-r--r--src/backend/access/common/indexvalid.c3
-rw-r--r--src/backend/access/common/printtup.c3
-rw-r--r--src/backend/access/common/scankey.c3
-rw-r--r--src/backend/access/common/tupdesc.c3
-rw-r--r--src/backend/access/gist/giststrat.c3
-rw-r--r--src/backend/access/hash/hash.c3
-rw-r--r--src/backend/access/hash/hashfunc.c3
-rw-r--r--src/backend/access/hash/hashinsert.c3
-rw-r--r--src/backend/access/hash/hashovfl.c3
-rw-r--r--src/backend/access/hash/hashpage.c3
-rw-r--r--src/backend/access/hash/hashscan.c3
-rw-r--r--src/backend/access/hash/hashsearch.c3
-rw-r--r--src/backend/access/hash/hashstrat.c3
-rw-r--r--src/backend/access/hash/hashutil.c3
-rw-r--r--src/backend/access/heap/heapam.c3
-rw-r--r--src/backend/access/heap/hio.c3
-rw-r--r--src/backend/access/heap/stats.c3
-rw-r--r--src/backend/access/index/genam.c3
-rw-r--r--src/backend/access/index/indexam.c3
-rw-r--r--src/backend/access/index/istrat.c3
-rw-r--r--src/backend/access/nbtree/nbtcompare.c3
-rw-r--r--src/backend/access/nbtree/nbtinsert.c3
-rw-r--r--src/backend/access/nbtree/nbtpage.c3
-rw-r--r--src/backend/access/nbtree/nbtree.c3
-rw-r--r--src/backend/access/nbtree/nbtscan.c3
-rw-r--r--src/backend/access/nbtree/nbtsearch.c3
-rw-r--r--src/backend/access/nbtree/nbtsort.c3
-rw-r--r--src/backend/access/nbtree/nbtstrat.c3
-rw-r--r--src/backend/access/nbtree/nbtutils.c3
-rw-r--r--src/backend/access/rtree/rtget.c3
-rw-r--r--src/backend/access/rtree/rtproc.c3
-rw-r--r--src/backend/access/rtree/rtree.c3
-rw-r--r--src/backend/access/rtree/rtscan.c3
-rw-r--r--src/backend/access/rtree/rtstrat.c3
-rw-r--r--src/backend/access/transam/transam.c3
-rw-r--r--src/backend/access/transam/transsup.c3
-rw-r--r--src/backend/access/transam/varsup.c3
-rw-r--r--src/backend/access/transam/xact.c3
-rw-r--r--src/backend/access/transam/xid.c3
-rw-r--r--src/backend/access/transam/xlog.c3
-rw-r--r--src/backend/bootstrap/bootparse.y3
-rw-r--r--src/backend/bootstrap/bootscanner.l3
-rw-r--r--src/backend/bootstrap/bootstrap.c3
-rw-r--r--src/backend/catalog/aclchk.c3
-rw-r--r--src/backend/catalog/catalog.c3
-rw-r--r--src/backend/catalog/heap.c3
-rw-r--r--src/backend/catalog/index.c3
-rw-r--r--src/backend/catalog/indexing.c3
-rw-r--r--src/backend/catalog/pg_aggregate.c3
-rw-r--r--src/backend/catalog/pg_operator.c3
-rw-r--r--src/backend/catalog/pg_proc.c3
-rw-r--r--src/backend/catalog/pg_type.c3
-rw-r--r--src/backend/commands/_deadcode/recipe.c3
-rw-r--r--src/backend/commands/_deadcode/recipe.h3
-rw-r--r--src/backend/commands/_deadcode/version.c3
-rw-r--r--src/backend/commands/async.c3
-rw-r--r--src/backend/commands/cluster.c3
-rw-r--r--src/backend/commands/command.c3
-rw-r--r--src/backend/commands/copy.c3
-rw-r--r--src/backend/commands/creatinh.c3
-rw-r--r--src/backend/commands/dbcommands.c3
-rw-r--r--src/backend/commands/define.c3
-rw-r--r--src/backend/commands/explain.c3
-rw-r--r--src/backend/commands/indexcmds.c3
-rw-r--r--src/backend/commands/remove.c3
-rw-r--r--src/backend/commands/rename.c3
-rw-r--r--src/backend/commands/user.c3
-rw-r--r--src/backend/commands/vacuum.c3
-rw-r--r--src/backend/commands/view.c3
-rw-r--r--src/backend/executor/_deadcode/nodeTee.c3
-rw-r--r--src/backend/executor/execAmi.c3
-rw-r--r--src/backend/executor/execFlatten.c3
-rw-r--r--src/backend/executor/execJunk.c3
-rw-r--r--src/backend/executor/execMain.c3
-rw-r--r--src/backend/executor/execProcnode.c3
-rw-r--r--src/backend/executor/execQual.c3
-rw-r--r--src/backend/executor/execScan.c3
-rw-r--r--src/backend/executor/execTuples.c3
-rw-r--r--src/backend/executor/execUtils.c3
-rw-r--r--src/backend/executor/functions.c3
-rw-r--r--src/backend/executor/nodeAgg.c3
-rw-r--r--src/backend/executor/nodeAppend.c3
-rw-r--r--src/backend/executor/nodeGroup.c3
-rw-r--r--src/backend/executor/nodeHash.c3
-rw-r--r--src/backend/executor/nodeHashjoin.c3
-rw-r--r--src/backend/executor/nodeIndexscan.c3
-rw-r--r--src/backend/executor/nodeMaterial.c3
-rw-r--r--src/backend/executor/nodeMergejoin.c3
-rw-r--r--src/backend/executor/nodeNestloop.c3
-rw-r--r--src/backend/executor/nodeResult.c3
-rw-r--r--src/backend/executor/nodeSeqscan.c3
-rw-r--r--src/backend/executor/nodeSort.c3
-rw-r--r--src/backend/executor/nodeSubplan.c3
-rw-r--r--src/backend/executor/nodeTidscan.c3
-rw-r--r--src/backend/executor/nodeUnique.c3
-rw-r--r--src/backend/lib/bit.c3
-rw-r--r--src/backend/lib/dllist.c3
-rw-r--r--src/backend/lib/fstack.c3
-rw-r--r--src/backend/lib/hasht.c3
-rw-r--r--src/backend/lib/lispsort.c3
-rw-r--r--src/backend/lib/stringinfo.c3
-rw-r--r--src/backend/libpq/auth.c3
-rw-r--r--src/backend/libpq/be-dumpdata.c3
-rw-r--r--src/backend/libpq/be-fsstubs.c3
-rw-r--r--src/backend/libpq/be-pqexec.c3
-rw-r--r--src/backend/libpq/password.c3
-rw-r--r--src/backend/libpq/portal.c3
-rw-r--r--src/backend/libpq/portalbuf.c3
-rw-r--r--src/backend/libpq/pqcomm.c3
-rw-r--r--src/backend/libpq/pqformat.c3
-rw-r--r--src/backend/libpq/pqpacket.c3
-rw-r--r--src/backend/libpq/pqsignal.c3
-rw-r--r--src/backend/libpq/util.c3
-rw-r--r--src/backend/main/main.c3
-rw-r--r--src/backend/nodes/copyfuncs.c3
-rw-r--r--src/backend/nodes/equalfuncs.c3
-rw-r--r--src/backend/nodes/freefuncs.c3
-rw-r--r--src/backend/nodes/list.c3
-rw-r--r--src/backend/nodes/makefuncs.c3
-rw-r--r--src/backend/nodes/nodeFuncs.c3
-rw-r--r--src/backend/nodes/nodes.c3
-rw-r--r--src/backend/nodes/outfuncs.c3
-rw-r--r--src/backend/nodes/print.c3
-rw-r--r--src/backend/nodes/read.c3
-rw-r--r--src/backend/nodes/readfuncs.c3
-rw-r--r--src/backend/optimizer/geqo/geqo_copy.c3
-rw-r--r--src/backend/optimizer/geqo/geqo_eval.c3
-rw-r--r--src/backend/optimizer/geqo/geqo_main.c3
-rw-r--r--src/backend/optimizer/geqo/geqo_misc.c3
-rw-r--r--src/backend/optimizer/geqo/geqo_params.c3
-rw-r--r--src/backend/optimizer/geqo/geqo_pool.c3
-rw-r--r--src/backend/optimizer/geqo/geqo_selection.c3
-rw-r--r--src/backend/optimizer/geqo/minspantree.c3
-rw-r--r--src/backend/optimizer/path/_deadcode/predmig.c3
-rw-r--r--src/backend/optimizer/path/_deadcode/xfunc.c3
-rw-r--r--src/backend/optimizer/path/allpaths.c3
-rw-r--r--src/backend/optimizer/path/clausesel.c3
-rw-r--r--src/backend/optimizer/path/costsize.c3
-rw-r--r--src/backend/optimizer/path/indxpath.c3
-rw-r--r--src/backend/optimizer/path/joinpath.c3
-rw-r--r--src/backend/optimizer/path/joinrels.c3
-rw-r--r--src/backend/optimizer/path/orindxpath.c3
-rw-r--r--src/backend/optimizer/path/pathkeys.c3
-rw-r--r--src/backend/optimizer/path/prune.c3
-rw-r--r--src/backend/optimizer/path/tidpath.c3
-rw-r--r--src/backend/optimizer/plan/createplan.c3
-rw-r--r--src/backend/optimizer/plan/initsplan.c3
-rw-r--r--src/backend/optimizer/plan/planmain.c3
-rw-r--r--src/backend/optimizer/plan/planner.c3
-rw-r--r--src/backend/optimizer/plan/setrefs.c3
-rw-r--r--src/backend/optimizer/plan/subselect.c3
-rw-r--r--src/backend/optimizer/prep/prepkeyset.c3
-rw-r--r--src/backend/optimizer/prep/prepqual.c3
-rw-r--r--src/backend/optimizer/prep/preptlist.c3
-rw-r--r--src/backend/optimizer/prep/prepunion.c3
-rw-r--r--src/backend/optimizer/util/clauses.c3
-rw-r--r--src/backend/optimizer/util/indexnode.c3
-rw-r--r--src/backend/optimizer/util/joininfo.c3
-rw-r--r--src/backend/optimizer/util/pathnode.c3
-rw-r--r--src/backend/optimizer/util/plancat.c3
-rw-r--r--src/backend/optimizer/util/relnode.c3
-rw-r--r--src/backend/optimizer/util/restrictinfo.c3
-rw-r--r--src/backend/optimizer/util/tlist.c3
-rw-r--r--src/backend/optimizer/util/var.c3
-rw-r--r--src/backend/parser/analyze.c3
-rw-r--r--src/backend/parser/gram.y3
-rw-r--r--src/backend/parser/keywords.c3
-rw-r--r--src/backend/parser/parse_agg.c3
-rw-r--r--src/backend/parser/parse_clause.c3
-rw-r--r--src/backend/parser/parse_coerce.c3
-rw-r--r--src/backend/parser/parse_expr.c3
-rw-r--r--src/backend/parser/parse_func.c3
-rw-r--r--src/backend/parser/parse_node.c3
-rw-r--r--src/backend/parser/parse_oper.c3
-rw-r--r--src/backend/parser/parse_relation.c3
-rw-r--r--src/backend/parser/parse_target.c3
-rw-r--r--src/backend/parser/parse_type.c3
-rw-r--r--src/backend/parser/parser.c3
-rw-r--r--src/backend/parser/scan.l3
-rw-r--r--src/backend/parser/scansup.c3
-rw-r--r--src/backend/port/dynloader/alpha.h3
-rw-r--r--src/backend/port/dynloader/bsd.c3
-rw-r--r--src/backend/port/dynloader/bsd.h3
-rw-r--r--src/backend/port/dynloader/bsdi.c3
-rw-r--r--src/backend/port/dynloader/bsdi.h3
-rw-r--r--src/backend/port/dynloader/dgux.h3
-rw-r--r--src/backend/port/dynloader/freebsd.c3
-rw-r--r--src/backend/port/dynloader/freebsd.h3
-rw-r--r--src/backend/port/dynloader/hpux.c3
-rw-r--r--src/backend/port/dynloader/hpux.h3
-rw-r--r--src/backend/port/dynloader/irix5.h3
-rw-r--r--src/backend/port/dynloader/linux.c3
-rw-r--r--src/backend/port/dynloader/linux.h3
-rw-r--r--src/backend/port/dynloader/sco.h3
-rwxr-xr-xsrc/backend/port/dynloader/solaris_i386.h3
-rwxr-xr-xsrc/backend/port/dynloader/solaris_sparc.h3
-rw-r--r--src/backend/port/dynloader/sunos4.h3
-rw-r--r--src/backend/port/dynloader/svr4.h3
-rw-r--r--src/backend/port/dynloader/ultrix4.c3
-rw-r--r--src/backend/port/dynloader/ultrix4.h3
-rw-r--r--src/backend/port/dynloader/univel.h3
-rw-r--r--src/backend/port/dynloader/unixware.h3
-rw-r--r--src/backend/port/dynloader/win.h3
-rw-r--r--src/backend/port/hpux/fixade.h3
-rw-r--r--src/backend/port/hpux/port-protos.h3
-rw-r--r--src/backend/port/strcasecmp.c3
-rw-r--r--src/backend/port/strtol.c3
-rw-r--r--src/backend/port/sunos4/float.h3
-rw-r--r--src/backend/postmaster/postmaster.c3
-rw-r--r--src/backend/rewrite/locks.c3
-rw-r--r--src/backend/rewrite/rewriteDefine.c3
-rw-r--r--src/backend/rewrite/rewriteHandler.c3
-rw-r--r--src/backend/rewrite/rewriteManip.c3
-rw-r--r--src/backend/rewrite/rewriteRemove.c3
-rw-r--r--src/backend/rewrite/rewriteSupport.c3
-rw-r--r--src/backend/storage/buffer/buf_init.c3
-rw-r--r--src/backend/storage/buffer/buf_table.c3
-rw-r--r--src/backend/storage/buffer/bufmgr.c3
-rw-r--r--src/backend/storage/buffer/freelist.c3
-rw-r--r--src/backend/storage/buffer/localbuf.c3
-rw-r--r--src/backend/storage/buffer/s_lock.c3
-rw-r--r--src/backend/storage/file/buffile.c3
-rw-r--r--src/backend/storage/file/fd.c3
-rw-r--r--src/backend/storage/ipc/ipc.c3
-rw-r--r--src/backend/storage/ipc/ipci.c3
-rw-r--r--src/backend/storage/ipc/shmem.c3
-rw-r--r--src/backend/storage/ipc/shmqueue.c3
-rw-r--r--src/backend/storage/ipc/sinval.c3
-rw-r--r--src/backend/storage/ipc/sinvaladt.c3
-rw-r--r--src/backend/storage/ipc/spin.c3
-rw-r--r--src/backend/storage/large_object/inv_api.c3
-rw-r--r--src/backend/storage/lmgr/lmgr.c3
-rw-r--r--src/backend/storage/lmgr/lock.c3
-rw-r--r--src/backend/storage/lmgr/multi.c3
-rw-r--r--src/backend/storage/lmgr/proc.c3
-rw-r--r--src/backend/storage/lmgr/single.c3
-rw-r--r--src/backend/storage/page/bufpage.c3
-rw-r--r--src/backend/storage/page/itemptr.c3
-rw-r--r--src/backend/storage/smgr/md.c3
-rw-r--r--src/backend/storage/smgr/mm.c3
-rw-r--r--src/backend/storage/smgr/smgr.c3
-rw-r--r--src/backend/storage/smgr/smgrtype.c3
-rw-r--r--src/backend/tcop/dest.c3
-rw-r--r--src/backend/tcop/fastpath.c3
-rw-r--r--src/backend/tcop/postgres.c5
-rw-r--r--src/backend/tcop/pquery.c3
-rw-r--r--src/backend/tcop/utility.c3
-rw-r--r--src/backend/tioga/tgRecipe.c3
-rw-r--r--src/backend/tioga/tgRecipe.h3
-rw-r--r--src/backend/utils/adt/acl.c3
-rw-r--r--src/backend/utils/adt/arrayfuncs.c3
-rw-r--r--src/backend/utils/adt/arrayutils.c3
-rw-r--r--src/backend/utils/adt/bool.c3
-rw-r--r--src/backend/utils/adt/char.c3
-rw-r--r--src/backend/utils/adt/chunk.c3
-rw-r--r--src/backend/utils/adt/date.c3
-rw-r--r--src/backend/utils/adt/datetime.c3
-rw-r--r--src/backend/utils/adt/datum.c3
-rw-r--r--src/backend/utils/adt/dt.c3
-rw-r--r--src/backend/utils/adt/filename.c3
-rw-r--r--src/backend/utils/adt/float.c3
-rw-r--r--src/backend/utils/adt/geo_ops.c3
-rw-r--r--src/backend/utils/adt/geo_selfuncs.c3
-rw-r--r--src/backend/utils/adt/int.c3
-rw-r--r--src/backend/utils/adt/like.c3
-rw-r--r--src/backend/utils/adt/misc.c3
-rw-r--r--src/backend/utils/adt/nabstime.c3
-rw-r--r--src/backend/utils/adt/name.c3
-rw-r--r--src/backend/utils/adt/not_in.c3
-rw-r--r--src/backend/utils/adt/numutils.c3
-rw-r--r--src/backend/utils/adt/oid.c3
-rw-r--r--src/backend/utils/adt/regexp.c3
-rw-r--r--src/backend/utils/adt/regproc.c3
-rw-r--r--src/backend/utils/adt/selfuncs.c3
-rw-r--r--src/backend/utils/adt/sets.c3
-rw-r--r--src/backend/utils/adt/tid.c3
-rw-r--r--src/backend/utils/adt/varchar.c3
-rw-r--r--src/backend/utils/adt/varlena.c3
-rw-r--r--src/backend/utils/cache/catcache.c3
-rw-r--r--src/backend/utils/cache/fcache.c3
-rw-r--r--src/backend/utils/cache/inval.c3
-rw-r--r--src/backend/utils/cache/lsyscache.c3
-rw-r--r--src/backend/utils/cache/rel.c3
-rw-r--r--src/backend/utils/cache/relcache.c3
-rw-r--r--src/backend/utils/cache/syscache.c3
-rw-r--r--src/backend/utils/cache/temprel.c3
-rw-r--r--src/backend/utils/error/assert.c3
-rw-r--r--src/backend/utils/error/elog.c3
-rw-r--r--src/backend/utils/error/exc.c3
-rw-r--r--src/backend/utils/error/excabort.c3
-rw-r--r--src/backend/utils/error/excid.c3
-rw-r--r--src/backend/utils/error/format.c3
-rw-r--r--src/backend/utils/fmgr/dfmgr.c3
-rw-r--r--src/backend/utils/fmgr/fmgr.c3
-rw-r--r--src/backend/utils/hash/dynahash.c3
-rw-r--r--src/backend/utils/hash/hashfn.c3
-rw-r--r--src/backend/utils/init/enbl.c3
-rw-r--r--src/backend/utils/init/findbe.c3
-rw-r--r--src/backend/utils/init/globals.c3
-rw-r--r--src/backend/utils/init/miscinit.c3
-rw-r--r--src/backend/utils/init/postinit.c3
-rw-r--r--src/backend/utils/misc/database.c3
-rw-r--r--src/backend/utils/misc/superuser.c3
-rw-r--r--src/backend/utils/mmgr/aset.c3
-rw-r--r--src/backend/utils/mmgr/mcxt.c3
-rw-r--r--src/backend/utils/mmgr/oset.c3
-rw-r--r--src/backend/utils/mmgr/palloc.c3
-rw-r--r--src/backend/utils/mmgr/portalmem.c3
-rw-r--r--src/backend/utils/sort/logtape.c3
-rw-r--r--src/backend/utils/sort/tuplesort.c3
-rw-r--r--src/backend/utils/time/tqual.c3
-rw-r--r--src/bin/pg_dump/common.c3
-rw-r--r--src/bin/pg_dump/pg_dump.c6
-rw-r--r--src/bin/pg_dump/pg_dump.h3
-rw-r--r--src/bin/pg_version/pg_version.c3
-rw-r--r--src/bin/pgtclsh/pgtclAppInit.c3
-rw-r--r--src/bin/pgtclsh/pgtkAppInit.c3
-rw-r--r--src/bin/psql/help.c3
-rw-r--r--src/bin/psql/startup.c3
-rw-r--r--src/include/access/attnum.h3
-rw-r--r--src/include/access/funcindex.h3
-rw-r--r--src/include/access/genam.h3
-rw-r--r--src/include/access/hash.h3
-rw-r--r--src/include/access/heapam.h3
-rw-r--r--src/include/access/hio.h3
-rw-r--r--src/include/access/htup.h3
-rw-r--r--src/include/access/ibit.h3
-rw-r--r--src/include/access/iqual.h3
-rw-r--r--src/include/access/istrat.h3
-rw-r--r--src/include/access/itup.h3
-rw-r--r--src/include/access/nbtree.h3
-rw-r--r--src/include/access/printtup.h3
-rw-r--r--src/include/access/relscan.h3
-rw-r--r--src/include/access/rtree.h3
-rw-r--r--src/include/access/rtscan.h3
-rw-r--r--src/include/access/rtstrat.h3
-rw-r--r--src/include/access/sdir.h3
-rw-r--r--src/include/access/skey.h3
-rw-r--r--src/include/access/strat.h3
-rw-r--r--src/include/access/transam.h3
-rw-r--r--src/include/access/tupdesc.h3
-rw-r--r--src/include/access/tupmacs.h3
-rw-r--r--src/include/access/valid.h3
-rw-r--r--src/include/access/xact.h3
-rw-r--r--src/include/bootstrap/bootstrap.h3
-rw-r--r--src/include/c.h3
-rw-r--r--src/include/catalog/catalog.h3
-rw-r--r--src/include/catalog/catname.h3
-rw-r--r--src/include/catalog/catversion.h3
-rw-r--r--src/include/catalog/heap.h3
-rw-r--r--src/include/catalog/index.h3
-rw-r--r--src/include/catalog/indexing.h3
-rw-r--r--src/include/catalog/pg_aggregate.h3
-rw-r--r--src/include/catalog/pg_am.h3
-rw-r--r--src/include/catalog/pg_amop.h3
-rw-r--r--src/include/catalog/pg_amproc.h3
-rw-r--r--src/include/catalog/pg_attrdef.h3
-rw-r--r--src/include/catalog/pg_attribute.h3
-rw-r--r--src/include/catalog/pg_class.h3
-rw-r--r--src/include/catalog/pg_database.h3
-rw-r--r--src/include/catalog/pg_description.h3
-rw-r--r--src/include/catalog/pg_group.h3
-rw-r--r--src/include/catalog/pg_index.h3
-rw-r--r--src/include/catalog/pg_inheritproc.h3
-rw-r--r--src/include/catalog/pg_inherits.h3
-rw-r--r--src/include/catalog/pg_ipl.h3
-rw-r--r--src/include/catalog/pg_language.h3
-rw-r--r--src/include/catalog/pg_listener.h3
-rw-r--r--src/include/catalog/pg_log.h3
-rw-r--r--src/include/catalog/pg_opclass.h3
-rw-r--r--src/include/catalog/pg_operator.h3
-rw-r--r--src/include/catalog/pg_proc.h3
-rw-r--r--src/include/catalog/pg_relcheck.h3
-rw-r--r--src/include/catalog/pg_rewrite.h3
-rw-r--r--src/include/catalog/pg_shadow.h3
-rw-r--r--src/include/catalog/pg_statistic.h3
-rw-r--r--src/include/catalog/pg_trigger.h3
-rw-r--r--src/include/catalog/pg_type.h3
-rw-r--r--src/include/catalog/pg_variable.h3
-rw-r--r--src/include/catalog/pg_version.h3
-rw-r--r--src/include/commands/async.h3
-rw-r--r--src/include/commands/cluster.h3
-rw-r--r--src/include/commands/command.h3
-rw-r--r--src/include/commands/copy.h3
-rw-r--r--src/include/commands/creatinh.h3
-rw-r--r--src/include/commands/dbcommands.h3
-rw-r--r--src/include/commands/defrem.h3
-rw-r--r--src/include/commands/explain.h3
-rw-r--r--src/include/commands/rename.h3
-rw-r--r--src/include/commands/vacuum.h3
-rw-r--r--src/include/commands/version.h3
-rw-r--r--src/include/commands/view.h3
-rw-r--r--src/include/executor/execFlatten.h3
-rw-r--r--src/include/executor/execdebug.h3
-rw-r--r--src/include/executor/execdefs.h3
-rw-r--r--src/include/executor/execdesc.h3
-rw-r--r--src/include/executor/executor.h3
-rw-r--r--src/include/executor/functions.h3
-rw-r--r--src/include/executor/hashjoin.h3
-rw-r--r--src/include/executor/nodeAgg.h3
-rw-r--r--src/include/executor/nodeAppend.h3
-rw-r--r--src/include/executor/nodeGroup.h3
-rw-r--r--src/include/executor/nodeHash.h3
-rw-r--r--src/include/executor/nodeHashjoin.h3
-rw-r--r--src/include/executor/nodeIndexscan.h3
-rw-r--r--src/include/executor/nodeMaterial.h3
-rw-r--r--src/include/executor/nodeMergejoin.h3
-rw-r--r--src/include/executor/nodeNestloop.h3
-rw-r--r--src/include/executor/nodeResult.h3
-rw-r--r--src/include/executor/nodeSeqscan.h3
-rw-r--r--src/include/executor/nodeSort.h3
-rw-r--r--src/include/executor/nodeTidscan.h3
-rw-r--r--src/include/executor/nodeUnique.h3
-rw-r--r--src/include/executor/tuptable.h3
-rw-r--r--src/include/lib/dllist.h3
-rw-r--r--src/include/lib/fstack.h3
-rw-r--r--src/include/lib/hasht.h3
-rw-r--r--src/include/lib/lispsort.h3
-rw-r--r--src/include/lib/stringinfo.h3
-rw-r--r--src/include/libpq/auth.h3
-rw-r--r--src/include/libpq/be-fsstubs.h3
-rw-r--r--src/include/libpq/libpq-be.h3
-rw-r--r--src/include/libpq/libpq-fs.h3
-rw-r--r--src/include/libpq/libpq.h3
-rw-r--r--src/include/libpq/pqcomm.h3
-rw-r--r--src/include/libpq/pqformat.h3
-rw-r--r--src/include/libpq/pqsignal.h3
-rw-r--r--src/include/miscadmin.h3
-rw-r--r--src/include/nodes/execnodes.h3
-rw-r--r--src/include/nodes/makefuncs.h3
-rw-r--r--src/include/nodes/memnodes.h3
-rw-r--r--src/include/nodes/nodeFuncs.h3
-rw-r--r--src/include/nodes/nodes.h3
-rw-r--r--src/include/nodes/params.h3
-rw-r--r--src/include/nodes/parsenodes.h3
-rw-r--r--src/include/nodes/pg_list.h3
-rw-r--r--src/include/nodes/plannodes.h3
-rw-r--r--src/include/nodes/primnodes.h3
-rw-r--r--src/include/nodes/print.h3
-rw-r--r--src/include/nodes/readfuncs.h3
-rw-r--r--src/include/nodes/relation.h3
-rw-r--r--src/include/optimizer/_deadcode/xfunc.h3
-rw-r--r--src/include/optimizer/clauses.h3
-rw-r--r--src/include/optimizer/cost.h3
-rw-r--r--src/include/optimizer/geqo.h3
-rw-r--r--src/include/optimizer/geqo_copy.h3
-rw-r--r--src/include/optimizer/geqo_gene.h3
-rw-r--r--src/include/optimizer/geqo_misc.h3
-rw-r--r--src/include/optimizer/geqo_mutation.h3
-rw-r--r--src/include/optimizer/geqo_pool.h3
-rw-r--r--src/include/optimizer/geqo_random.h3
-rw-r--r--src/include/optimizer/geqo_recombination.h3
-rw-r--r--src/include/optimizer/geqo_selection.h3
-rw-r--r--src/include/optimizer/internal.h3
-rw-r--r--src/include/optimizer/joininfo.h3
-rw-r--r--src/include/optimizer/pathnode.h3
-rw-r--r--src/include/optimizer/paths.h3
-rw-r--r--src/include/optimizer/plancat.h3
-rw-r--r--src/include/optimizer/planmain.h3
-rw-r--r--src/include/optimizer/planner.h3
-rw-r--r--src/include/optimizer/prep.h3
-rw-r--r--src/include/optimizer/restrictinfo.h3
-rw-r--r--src/include/optimizer/tlist.h3
-rw-r--r--src/include/optimizer/var.h3
-rw-r--r--src/include/parser/analyze.h3
-rw-r--r--src/include/parser/gramparse.h3
-rw-r--r--src/include/parser/keywords.h3
-rw-r--r--src/include/parser/parse_agg.h3
-rw-r--r--src/include/parser/parse_clause.h3
-rw-r--r--src/include/parser/parse_coerce.h3
-rw-r--r--src/include/parser/parse_expr.h3
-rw-r--r--src/include/parser/parse_func.h3
-rw-r--r--src/include/parser/parse_node.h3
-rw-r--r--src/include/parser/parse_oper.h3
-rw-r--r--src/include/parser/parse_relation.h3
-rw-r--r--src/include/parser/parse_target.h3
-rw-r--r--src/include/parser/parse_type.h3
-rw-r--r--src/include/parser/parser.h3
-rw-r--r--src/include/parser/parsetree.h3
-rw-r--r--src/include/parser/scansup.h3
-rw-r--r--src/include/postgres.h3
-rw-r--r--src/include/rewrite/locks.h3
-rw-r--r--src/include/rewrite/prs2lock.h3
-rw-r--r--src/include/rewrite/rewriteDefine.h3
-rw-r--r--src/include/rewrite/rewriteHandler.h3
-rw-r--r--src/include/rewrite/rewriteManip.h3
-rw-r--r--src/include/rewrite/rewriteRemove.h3
-rw-r--r--src/include/rewrite/rewriteSupport.h3
-rw-r--r--src/include/rusagestub.h3
-rw-r--r--src/include/storage/backendid.h3
-rw-r--r--src/include/storage/block.h3
-rw-r--r--src/include/storage/buf.h3
-rw-r--r--src/include/storage/buf_internals.h3
-rw-r--r--src/include/storage/buffile.h3
-rw-r--r--src/include/storage/bufmgr.h3
-rw-r--r--src/include/storage/bufpage.h3
-rw-r--r--src/include/storage/fd.h3
-rw-r--r--src/include/storage/ipc.h3
-rw-r--r--src/include/storage/item.h3
-rw-r--r--src/include/storage/itemid.h3
-rw-r--r--src/include/storage/itempos.h3
-rw-r--r--src/include/storage/itemptr.h3
-rw-r--r--src/include/storage/large_object.h3
-rw-r--r--src/include/storage/lmgr.h3
-rw-r--r--src/include/storage/lock.h3
-rw-r--r--src/include/storage/multilev.h3
-rw-r--r--src/include/storage/off.h3
-rw-r--r--src/include/storage/page.h3
-rw-r--r--src/include/storage/pagenum.h3
-rw-r--r--src/include/storage/pos.h3
-rw-r--r--src/include/storage/proc.h3
-rw-r--r--src/include/storage/s_lock.h3
-rw-r--r--src/include/storage/shmem.h3
-rw-r--r--src/include/storage/sinval.h3
-rw-r--r--src/include/storage/sinvaladt.h3
-rw-r--r--src/include/storage/smgr.h3
-rw-r--r--src/include/storage/spin.h3
-rw-r--r--src/include/tcop/dest.h3
-rw-r--r--src/include/tcop/fastpath.h3
-rw-r--r--src/include/tcop/pquery.h3
-rw-r--r--src/include/tcop/tcopdebug.h3
-rw-r--r--src/include/tcop/tcopprot.h3
-rw-r--r--src/include/tcop/utility.h3
-rw-r--r--src/include/utils/acl.h3
-rw-r--r--src/include/utils/array.h3
-rw-r--r--src/include/utils/bit.h3
-rw-r--r--src/include/utils/builtins.h3
-rw-r--r--src/include/utils/catcache.h3
-rw-r--r--src/include/utils/datetime.h3
-rw-r--r--src/include/utils/datum.h3
-rw-r--r--src/include/utils/dt.h3
-rw-r--r--src/include/utils/dynahash.h3
-rw-r--r--src/include/utils/dynamic_loader.h3
-rw-r--r--src/include/utils/elog.h3
-rw-r--r--src/include/utils/exc.h3
-rw-r--r--src/include/utils/excid.h3
-rw-r--r--src/include/utils/fcache.h3
-rw-r--r--src/include/utils/fcache2.h3
-rw-r--r--src/include/utils/fmgrtab.h3
-rw-r--r--src/include/utils/geo_decls.h3
-rw-r--r--src/include/utils/hsearch.h3
-rw-r--r--src/include/utils/inet.h3
-rw-r--r--src/include/utils/int8.h3
-rw-r--r--src/include/utils/inval.h3
-rw-r--r--src/include/utils/logtape.h3
-rw-r--r--src/include/utils/lsyscache.h3
-rw-r--r--src/include/utils/mcxt.h3
-rw-r--r--src/include/utils/memutils.h3
-rw-r--r--src/include/utils/module.h3
-rw-r--r--src/include/utils/nabstime.h3
-rw-r--r--src/include/utils/palloc.h3
-rw-r--r--src/include/utils/portal.h3
-rw-r--r--src/include/utils/rel.h3
-rw-r--r--src/include/utils/rel2.h3
-rw-r--r--src/include/utils/relcache.h3
-rw-r--r--src/include/utils/sets.h3
-rw-r--r--src/include/utils/syscache.h3
-rw-r--r--src/include/utils/temprel.h3
-rw-r--r--src/include/utils/tqual.h3
-rw-r--r--src/include/utils/tuplesort.h3
-rw-r--r--src/interfaces/ecpg/preproc/keywords.c3
-rw-r--r--src/interfaces/ecpg/preproc/pgc.l3
-rw-r--r--src/interfaces/libpgtcl/libpgtcl.h3
-rw-r--r--src/interfaces/libpgtcl/pgtcl.c3
-rw-r--r--src/interfaces/libpgtcl/pgtclCmds.c3
-rw-r--r--src/interfaces/libpgtcl/pgtclCmds.h3
-rw-r--r--src/interfaces/libpgtcl/pgtclId.c3
-rw-r--r--src/interfaces/libpgtcl/pgtclId.h3
-rw-r--r--src/interfaces/libpq++/libpq++.h3
-rw-r--r--src/interfaces/libpq++/pgconnection.h3
-rw-r--r--src/interfaces/libpq++/pgcursordb.h3
-rw-r--r--src/interfaces/libpq++/pgdatabase.h3
-rw-r--r--src/interfaces/libpq++/pglobject.h3
-rw-r--r--src/interfaces/libpq++/pgtransdb.h3
-rw-r--r--src/interfaces/libpq/fe-auth.c3
-rw-r--r--src/interfaces/libpq/fe-auth.h3
-rw-r--r--src/interfaces/libpq/fe-connect.c3
-rw-r--r--src/interfaces/libpq/fe-exec.c3
-rw-r--r--src/interfaces/libpq/fe-lobj.c3
-rw-r--r--src/interfaces/libpq/fe-misc.c3
-rw-r--r--src/interfaces/libpq/fe-print.c3
-rw-r--r--src/interfaces/libpq/libpq-fe.h3
-rw-r--r--src/interfaces/libpq/libpq-int.h3
-rw-r--r--src/interfaces/libpq/pqexpbuffer.c3
-rw-r--r--src/interfaces/libpq/pqexpbuffer.h3
-rw-r--r--src/interfaces/libpq/pqsignal.c3
-rw-r--r--src/interfaces/libpq/pqsignal.h3
-rw-r--r--src/test/examples/testlo.c3
-rw-r--r--src/test/examples/testlo2.c3
-rw-r--r--src/tutorial/beard.c3
-rw-r--r--src/utils/strdup.c3
-rw-r--r--src/utils/version.c3
596 files changed, 1195 insertions, 598 deletions
diff --git a/contrib/os2client/c.h b/contrib/os2client/c.h
index 5f445bfb6a..d58168b68f 100644
--- a/contrib/os2client/c.h
+++ b/contrib/os2client/c.h
@@ -7,7 +7,8 @@
* postgres.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
index f751ff6ae0..0f5e7333b1 100644
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -3,7 +3,8 @@
* vacuumlo.c
* This removes orphaned large objects from a database.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 8a0f2f0e13..77ca1636e6 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -4,7 +4,8 @@
* This file contains heap tuple accessor and mutator routines, as well
* as a few various tuple utilities.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index f35a76f350..ee45d66c06 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -4,7 +4,8 @@
* This file contains index tuple accessor and mutator routines,
* as well as a few various tuple utilities.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/common/indexvalid.c b/src/backend/access/common/indexvalid.c
index ace5aa2db3..437f6af13a 100644
--- a/src/backend/access/common/indexvalid.c
+++ b/src/backend/access/common/indexvalid.c
@@ -3,7 +3,8 @@
* indexvalid.c
* index tuple qualification validity checking code
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index ea6e789f13..79b4875f91 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -4,7 +4,8 @@
* Routines to print out tuples to the destination (binary or non-binary
* portals, frontend/interactive backend, etc.).
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/common/scankey.c b/src/backend/access/common/scankey.c
index a7020a1c32..4f0248cc8e 100644
--- a/src/backend/access/common/scankey.c
+++ b/src/backend/access/common/scankey.c
@@ -3,7 +3,8 @@
* scan.c
* scan direction and key code
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index 6fc45af9ae..f39cff67b1 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -3,7 +3,8 @@
* tupdesc.c
* POSTGRES tuple descriptor support code
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/gist/giststrat.c b/src/backend/access/gist/giststrat.c
index e1a5e497a7..afd921d822 100644
--- a/src/backend/access/gist/giststrat.c
+++ b/src/backend/access/gist/giststrat.c
@@ -3,7 +3,8 @@
* giststrat.c
* strategy map data for GiSTs.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 44e2160c24..9c5200249c 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -3,7 +3,8 @@
* hash.c
* Implementation of Margo Seltzer's Hashing package for postgres.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/hash/hashfunc.c b/src/backend/access/hash/hashfunc.c
index 98a9e80ae5..b7a439251f 100644
--- a/src/backend/access/hash/hashfunc.c
+++ b/src/backend/access/hash/hashfunc.c
@@ -3,7 +3,8 @@
* hashfunc.c
* Comparison functions for hash access method.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index 7f20a73ed6..789a123a59 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -3,7 +3,8 @@
* hashinsert.c
* Item insertion in hash tables for Postgres.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
index 2f83f05343..264925e5eb 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -3,7 +3,8 @@
* hashovfl.c
* Overflow page management code for the Postgres hash access method
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index 94eb644c57..a4162903e9 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -3,7 +3,8 @@
* hashpage.c
* Hash table page management code for the Postgres hash access method
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/hash/hashscan.c b/src/backend/access/hash/hashscan.c
index ff08a36e9e..5e5d2356fd 100644
--- a/src/backend/access/hash/hashscan.c
+++ b/src/backend/access/hash/hashscan.c
@@ -3,7 +3,8 @@
* hashscan.c
* manage scans on hash tables
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index e46f742fa2..7fad6e11c9 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -3,7 +3,8 @@
* hashsearch.c
* search code for postgres hash tables
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/hash/hashstrat.c b/src/backend/access/hash/hashstrat.c
index 7c6e2bf64f..47cedfa2c7 100644
--- a/src/backend/access/hash/hashstrat.c
+++ b/src/backend/access/hash/hashstrat.c
@@ -3,7 +3,8 @@
* btstrat.c
* Srategy map entries for the btree indexed access method
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index 437503b9dd..3945e51d55 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -3,7 +3,8 @@
* btutils.c
* Utility code for Postgres btree implementation.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index c26375977e..5c4ee13532 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -3,7 +3,8 @@
* heapam.c
* heap access method code
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c
index 97738f5bc6..b571dc14a9 100644
--- a/src/backend/access/heap/hio.c
+++ b/src/backend/access/heap/hio.c
@@ -3,7 +3,8 @@
* hio.c
* POSTGRES heap access method input/output code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/heap/stats.c b/src/backend/access/heap/stats.c
index e19bef9e3e..57d5965d3b 100644
--- a/src/backend/access/heap/stats.c
+++ b/src/backend/access/heap/stats.c
@@ -3,7 +3,8 @@
* stats.c
* heap access method debugging statistic collection routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
index 923c887069..75b41cc9ac 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -3,7 +3,8 @@
* genam.c
* general index access method routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index de3c21eb75..b0ef11d7ef 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -3,7 +3,8 @@
* indexam.c
* general index access method routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c
index dc1adddbb6..7ce3d740b1 100644
--- a/src/backend/access/index/istrat.c
+++ b/src/backend/access/index/istrat.c
@@ -4,7 +4,8 @@
* index scan strategy manipulation code and index strategy manipulation
* operator code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c
index 669d233b81..5402f3d617 100644
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -3,7 +3,8 @@
* nbtcompare.c
* Comparison functions for btree access method.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index 236e93ab37..674aea42b3 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -3,7 +3,8 @@
* btinsert.c
* Item insertion in Lehman and Yao btrees for Postgres.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 5ce4a5b43a..056ad729fa 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -4,7 +4,8 @@
* BTree-specific page management code for the Postgres btree access
* method.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index 07f8d9d365..f56218e511 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -8,7 +8,8 @@
* This file contains only the public interface routines.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header$
diff --git a/src/backend/access/nbtree/nbtscan.c b/src/backend/access/nbtree/nbtscan.c
index 78a074a6f7..f676dc5d10 100644
--- a/src/backend/access/nbtree/nbtscan.c
+++ b/src/backend/access/nbtree/nbtscan.c
@@ -3,7 +3,8 @@
* btscan.c
* manage scans on btrees.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index 825bd0ad50..4a37f9f88a 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -3,7 +3,8 @@
* btsearch.c
* search code for postgres btrees.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index 68eccba90d..2bdc464326 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -24,7 +24,8 @@
* would probably be better.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header$
diff --git a/src/backend/access/nbtree/nbtstrat.c b/src/backend/access/nbtree/nbtstrat.c
index e9e15b1474..dfc193c8a4 100644
--- a/src/backend/access/nbtree/nbtstrat.c
+++ b/src/backend/access/nbtree/nbtstrat.c
@@ -3,7 +3,8 @@
* btstrat.c
* Srategy map entries for the btree indexed access method
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index 33b62c8c86..351c68e454 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -3,7 +3,8 @@
* btutils.c
* Utility code for Postgres btree implementation.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/rtree/rtget.c b/src/backend/access/rtree/rtget.c
index 990b16d6a4..70435406bd 100644
--- a/src/backend/access/rtree/rtget.c
+++ b/src/backend/access/rtree/rtget.c
@@ -3,7 +3,8 @@
* rtget.c
* fetch tuples from an rtree scan.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c
index 9069739c4a..86fe2a87d8 100644
--- a/src/backend/access/rtree/rtproc.c
+++ b/src/backend/access/rtree/rtproc.c
@@ -3,7 +3,8 @@
* rtproc.c
* pg_amproc entries for rtrees.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index e4c6312572..4dcf54b027 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -3,7 +3,8 @@
* rtree.c
* interface routines for the postgres rtree indexed access method.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c
index db4f23c9a9..3cbd21b4eb 100644
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -3,7 +3,8 @@
* rtscan.c
* routines to manage scans on index relations
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/rtree/rtstrat.c b/src/backend/access/rtree/rtstrat.c
index 827dc0e198..9880593f95 100644
--- a/src/backend/access/rtree/rtstrat.c
+++ b/src/backend/access/rtree/rtstrat.c
@@ -3,7 +3,8 @@
* rtstrat.c
* strategy map data for rtrees.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
index c720485002..db175ac565 100644
--- a/src/backend/access/transam/transam.c
+++ b/src/backend/access/transam/transam.c
@@ -3,7 +3,8 @@
* transam.c
* postgres transaction log/time interface routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/transam/transsup.c b/src/backend/access/transam/transsup.c
index 277a414d9f..035873d0b7 100644
--- a/src/backend/access/transam/transsup.c
+++ b/src/backend/access/transam/transsup.c
@@ -3,7 +3,8 @@
* transsup.c
* postgres transaction access method support code
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c
index 6a8e3a582e..6c4d1752d6 100644
--- a/src/backend/access/transam/varsup.c
+++ b/src/backend/access/transam/varsup.c
@@ -3,7 +3,8 @@
* varsup.c
* postgres variable relation support routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 3ed644a23e..b14f06f0b8 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -3,7 +3,8 @@
* xact.c
* top level transaction system support routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/access/transam/xid.c b/src/backend/access/transam/xid.c
index 49e8e3e51c..0df8909a19 100644
--- a/src/backend/access/transam/xid.c
+++ b/src/backend/access/transam/xid.c
@@ -3,7 +3,8 @@
* xid.c
* POSTGRES transaction identifier code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index eefda816be..fc6004accb 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -3,7 +3,8 @@
* xlog.c
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Header$
*
diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y
index d9d789183a..b6eda27053 100644
--- a/src/backend/bootstrap/bootparse.y
+++ b/src/backend/bootstrap/bootparse.y
@@ -4,7 +4,8 @@
* backendparse.y
* yacc parser grammer for the "backend" initialization program.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l
index bcc9378042..92eeefc0bd 100644
--- a/src/backend/bootstrap/bootscanner.l
+++ b/src/backend/bootstrap/bootscanner.l
@@ -4,7 +4,8 @@
* bootscanner.lex
* a lexical scanner for the bootstrap parser
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 8e697581c2..c3ddec95bf 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -4,7 +4,8 @@
* routines to support running postgres in 'bootstrap' mode
* bootstrap mode is used to create the initial template database
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header$
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index 9a2af492d9..15f9f4c028 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -3,7 +3,8 @@
* aclchk.c
* Routines to check access control permissions.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index 2b7b840982..34974d2328 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -3,7 +3,8 @@
* catalog.c
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 79da7489d2..da16fc0a99 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -3,7 +3,8 @@
* heap.c
* code to create and destroy POSTGRES heap relations
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 9504158b3c..9e27db9792 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -3,7 +3,8 @@
* index.c
* code to create and destroy POSTGRES index relations
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c
index 2239ab490a..b6fd261a98 100644
--- a/src/backend/catalog/indexing.c
+++ b/src/backend/catalog/indexing.c
@@ -4,7 +4,8 @@
* This file contains routines to support indices defined on system
* catalogs.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c
index 36218d7be2..63c2cb4231 100644
--- a/src/backend/catalog/pg_aggregate.c
+++ b/src/backend/catalog/pg_aggregate.c
@@ -3,7 +3,8 @@
* pg_aggregate.c
* routines to support manipulation of the pg_aggregate relation
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index f9f69aa53e..4103abe373 100644
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -3,7 +3,8 @@
* pg_operator.c
* routines to support manipulation of the pg_operator relation
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index 43bb0ccf4f..936134d70e 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -3,7 +3,8 @@
* pg_proc.c
* routines to support manipulation of the pg_proc relation
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 4f5a86741c..e0fc4e75e2 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -3,7 +3,8 @@
* pg_type.c
* routines to support manipulation of the pg_type relation
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/commands/_deadcode/recipe.c b/src/backend/commands/_deadcode/recipe.c
index e1346206d9..00bb824591 100644
--- a/src/backend/commands/_deadcode/recipe.c
+++ b/src/backend/commands/_deadcode/recipe.c
@@ -3,7 +3,8 @@
* recipe.c
* routines for handling execution of Tioga recipes
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/commands/_deadcode/recipe.h b/src/backend/commands/_deadcode/recipe.h
index dfc8b6b31a..2a69bce4ee 100644
--- a/src/backend/commands/_deadcode/recipe.h
+++ b/src/backend/commands/_deadcode/recipe.h
@@ -3,7 +3,8 @@
* recipe.h
* recipe handling routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/commands/_deadcode/version.c b/src/backend/commands/_deadcode/version.c
index 0fb6b29a9e..aec327cb57 100644
--- a/src/backend/commands/_deadcode/version.c
+++ b/src/backend/commands/_deadcode/version.c
@@ -3,7 +3,8 @@
* version.c
* This file contains all the rules that govern all version semantics.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* The version stuff has not been tested under postgres95 and probably
* doesn't work! - jolly 8/19/95
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 8d468cf554..ece4da3bf4 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -3,7 +3,8 @@
* async.c
* Asynchronous notification: NOTIFY, LISTEN, UNLISTEN
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header$
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 211365e47c..dc26c12cec 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -10,7 +10,8 @@
* my (probably bogus) assumptions about the way this works.
* [pbrown '94]
*
- * Copyright (c) 1994-5, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994-5, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c
index 838afea2c0..d36a743490 100644
--- a/src/backend/commands/command.c
+++ b/src/backend/commands/command.c
@@ -3,7 +3,8 @@
* command.c
* random postgres portal and utility support code
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 849022f552..dd116efc75 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -2,7 +2,8 @@
*
* copy.c
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c
index 915439233b..b4125c583e 100644
--- a/src/backend/commands/creatinh.c
+++ b/src/backend/commands/creatinh.c
@@ -3,7 +3,8 @@
* creatinh.c
* POSTGRES create/destroy relation with inheritance utility code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index d16e910d3e..109df41e4d 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -3,7 +3,8 @@
* dbcommands.c
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c
index eb7f1a2ff9..466dd11d0c 100644
--- a/src/backend/commands/define.c
+++ b/src/backend/commands/define.c
@@ -5,7 +5,8 @@
* These routines execute some of the CREATE statements. In an earlier
* version of Postgres, these were "define" statements.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index b705b76bc8..29e15f2bb6 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -2,7 +2,8 @@
* explain.c
* Explain the query execution plan
*
- * Copyright (c) 1994-5, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994-5, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 6c82a580e7..8a730afde7 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -3,7 +3,8 @@
* indexcmds.c
* POSTGRES define, extend and remove index code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c
index ecbb38098a..2030f1eb4b 100644
--- a/src/backend/commands/remove.c
+++ b/src/backend/commands/remove.c
@@ -3,7 +3,8 @@
* remove.c
* POSTGRES remove (function | type | operator ) utilty code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c
index e3f7c94526..f8be0d861f 100644
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@@ -3,7 +3,8 @@
* rename.c
* renameatt() and renamerel() reside here.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 37beed9782..055c2dd4b4 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -3,7 +3,8 @@
* user.c
* use pg_exec_query to create a new user in the catalog
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index d75a9f8ac2..504ca4e8f0 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -3,7 +3,8 @@
* vacuum.c
* the postgres vacuum cleaner
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index 836103bc89..9d90dcd6dd 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -3,7 +3,8 @@
* view.c
* use rewrite rules to construct views
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/executor/_deadcode/nodeTee.c b/src/backend/executor/_deadcode/nodeTee.c
index 8bf2acb93e..f7e7dbafee 100644
--- a/src/backend/executor/_deadcode/nodeTee.c
+++ b/src/backend/executor/_deadcode/nodeTee.c
@@ -3,7 +3,8 @@
* nodeTee.c
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* DESCRIPTION
* This code provides support for a tee node, which allows
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 174abff38f..0e1503a2c2 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -3,7 +3,8 @@
* execAmi.c
* miscellaneous executor access method routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/executor/execFlatten.c b/src/backend/executor/execFlatten.c
index 771bc407f7..8f7ba37ee8 100644
--- a/src/backend/executor/execFlatten.c
+++ b/src/backend/executor/execFlatten.c
@@ -4,7 +4,8 @@
* This file handles the nodes associated with flattening sets in the
* target list of queries containing functions returning sets.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c
index 497a2cfa6a..0f620a09b3 100644
--- a/src/backend/executor/execJunk.c
+++ b/src/backend/executor/execJunk.c
@@ -3,7 +3,8 @@
* junk.c
* Junk attribute support stuff....
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 350cd52307..5f4563152c 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -22,7 +22,8 @@
* ExecutorRun accepts 'feature' and 'count' arguments that specify whether
* the plan is to be executed forwards, backwards, and for how many tuples.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c
index 1a936a33cd..fdec191df3 100644
--- a/src/backend/executor/execProcnode.c
+++ b/src/backend/executor/execProcnode.c
@@ -7,7 +7,8 @@
* ExecProcNode, or ExecEndNode on its subnodes and do the appropriate
* processing..
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index b1c128d6f6..9a22eb5b8c 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -3,7 +3,8 @@
* execQual.c
* Routines to evaluate qualification and targetlist expressions
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/executor/execScan.c b/src/backend/executor/execScan.c
index f8e31642b6..40aff341fe 100644
--- a/src/backend/executor/execScan.c
+++ b/src/backend/executor/execScan.c
@@ -7,7 +7,8 @@
* stuff - checking the qualification and projecting the tuple
* appropriately.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index f57976498e..519cd74feb 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -10,7 +10,8 @@
* This information is needed by routines manipulating tuples
* (getattribute, formtuple, etc.).
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index da0d286ece..2370bdfd3b 100644
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@@ -3,7 +3,8 @@
* execUtils.c
* miscellanious executor utility routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index 2d7cf495e9..00e795b8bd 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -4,7 +4,8 @@
* Routines to handle functions called from the executor
* Putting this stuff in fmgr makes the postmaster a mess....
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index a4ecd2ddf3..8d7b3fc8db 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -28,7 +28,8 @@
* flag column to pg_aggregate and a parameter to CREATE AGGREGATE...)
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header$
diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c
index 3f990ec86c..1bcb9a1391 100644
--- a/src/backend/executor/nodeAppend.c
+++ b/src/backend/executor/nodeAppend.c
@@ -3,7 +3,8 @@
* nodeAppend.c
* routines to handle append nodes.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c
index 70529f6824..0d65e6fbd5 100644
--- a/src/backend/executor/nodeGroup.c
+++ b/src/backend/executor/nodeGroup.c
@@ -3,7 +3,8 @@
* nodeGroup.c
* Routines to handle group nodes (used for queries with GROUP BY clause).
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* DESCRIPTION
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 81f0096bb2..56b93dc445 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -3,7 +3,8 @@
* nodeHash.c
* Routines to hash relations for hashjoin
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* $Id$
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
index 36b40b654f..0767d862bd 100644
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -3,7 +3,8 @@
* nodeHashjoin.c
* Routines to handle hash join nodes
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 42ec0d85e7..2a65eb603a 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -3,7 +3,8 @@
* nodeIndexscan.c
* Routines to support indexes and indexed scans of relations
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c
index 667b1726f8..d13881451d 100644
--- a/src/backend/executor/nodeMaterial.c
+++ b/src/backend/executor/nodeMaterial.c
@@ -3,7 +3,8 @@
* nodeMaterial.c
* Routines to handle materialization nodes.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index f0e81ab9a4..2249b61719 100644
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -3,7 +3,8 @@
* nodeMergejoin.c
* routines supporting merge joins
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c
index da6fd33eff..3a539844ec 100644
--- a/src/backend/executor/nodeNestloop.c
+++ b/src/backend/executor/nodeNestloop.c
@@ -3,7 +3,8 @@
* nodeNestloop.c
* routines to support nest-loop joins
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/executor/nodeResult.c b/src/backend/executor/nodeResult.c
index a2611373d9..e28280b8ea 100644
--- a/src/backend/executor/nodeResult.c
+++ b/src/backend/executor/nodeResult.c
@@ -3,7 +3,8 @@
* nodeResult.c
* support for constant nodes needing special code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* DESCRIPTION
diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c
index d8e7c26f16..393651b4a5 100644
--- a/src/backend/executor/nodeSeqscan.c
+++ b/src/backend/executor/nodeSeqscan.c
@@ -3,7 +3,8 @@
* nodeSeqscan.c
* Support routines for sequential scans of relations.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c
index 4bc54643db..0d2f0eebbc 100644
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@@ -3,7 +3,8 @@
* nodeSort.c
* Routines to handle sorting of relations.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index 2579111398..31591585ff 100644
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -3,7 +3,8 @@
* nodeSubplan.c
* routines to support subselects
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header$
diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c
index 4c9fdf9236..e6dbad80a6 100644
--- a/src/backend/executor/nodeTidscan.c
+++ b/src/backend/executor/nodeTidscan.c
@@ -3,7 +3,8 @@
* nodeTidscan.c
* Routines to support direct tid scans of relations
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c
index 8017414d31..618db24bac 100644
--- a/src/backend/executor/nodeUnique.c
+++ b/src/backend/executor/nodeUnique.c
@@ -3,7 +3,8 @@
* nodeUnique.c
* Routines to handle unique'ing of queries where appropriate
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/lib/bit.c b/src/backend/lib/bit.c
index d4b2cee3cc..c13755b08e 100644
--- a/src/backend/lib/bit.c
+++ b/src/backend/lib/bit.c
@@ -3,7 +3,8 @@
* bit.c
* Standard bit array code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/lib/dllist.c b/src/backend/lib/dllist.c
index 6f257d4f36..fea4d70ada 100644
--- a/src/backend/lib/dllist.c
+++ b/src/backend/lib/dllist.c
@@ -5,7 +5,8 @@
* replaces the old simplelists stuff
* the elements of the lists are void*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/lib/fstack.c b/src/backend/lib/fstack.c
index ec7c839f55..2724962013 100644
--- a/src/backend/lib/fstack.c
+++ b/src/backend/lib/fstack.c
@@ -3,7 +3,8 @@
* fstack.c
* Fixed format stack definitions.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/lib/hasht.c b/src/backend/lib/hasht.c
index 9b52936850..86efe63783 100644
--- a/src/backend/lib/hasht.c
+++ b/src/backend/lib/hasht.c
@@ -4,7 +4,8 @@
* hash table related functions that are not directly supported
* by the hashing packages under utils/hash.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/lib/lispsort.c b/src/backend/lib/lispsort.c
index 1390491d07..dc187bfeff 100644
--- a/src/backend/lib/lispsort.c
+++ b/src/backend/lib/lispsort.c
@@ -2,7 +2,8 @@
*
* lispsort.c
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/lib/stringinfo.c b/src/backend/lib/stringinfo.c
index ef655eebdc..7d3863ed6a 100644
--- a/src/backend/lib/stringinfo.c
+++ b/src/backend/lib/stringinfo.c
@@ -6,7 +6,8 @@
* It can be used to buffer either ordinary C strings (null-terminated text)
* or arbitrary binary data. All storage is allocated with palloc().
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 70215c4469..04bb610c7b 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -3,7 +3,8 @@
* auth.c
* Routines to handle network authentication
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/libpq/be-dumpdata.c b/src/backend/libpq/be-dumpdata.c
index 4f2cd8c521..32579c2691 100644
--- a/src/backend/libpq/be-dumpdata.c
+++ b/src/backend/libpq/be-dumpdata.c
@@ -4,7 +4,8 @@
* support for collection of returned tuples from an internal
* PQ call into a backend buffer.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index 3653aab30f..6d033f43df 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -3,7 +3,8 @@
* be-fsstubs.c
* support for filesystem operations on large objects
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/libpq/be-pqexec.c b/src/backend/libpq/be-pqexec.c
index c8ee504dca..831a537606 100644
--- a/src/backend/libpq/be-pqexec.c
+++ b/src/backend/libpq/be-pqexec.c
@@ -4,7 +4,8 @@
* support for executing POSTGRES commands and functions from a
* user-defined function in a backend.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/libpq/password.c b/src/backend/libpq/password.c
index 6467933072..335fadc367 100644
--- a/src/backend/libpq/password.c
+++ b/src/backend/libpq/password.c
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c
index 27ace3d0ad..8c151a3a67 100644
--- a/src/backend/libpq/portal.c
+++ b/src/backend/libpq/portal.c
@@ -3,7 +3,8 @@
* portal.c
* generalized portal support routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/libpq/portalbuf.c b/src/backend/libpq/portalbuf.c
index 1388fcf1ce..20623f3197 100644
--- a/src/backend/libpq/portalbuf.c
+++ b/src/backend/libpq/portalbuf.c
@@ -3,7 +3,8 @@
* portalbuf.c
* portal buffer support routines for src/libpq/portal.c
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 47574132b8..3b6a0a8bcb 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -26,7 +26,8 @@
* the backend's "backend/libpq" is quite separate from "interfaces/libpq".
* All that remains is similarities of names to trap the unwary...
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c
index 8028afe7f7..bf299e4e63 100644
--- a/src/backend/libpq/pqformat.c
+++ b/src/backend/libpq/pqformat.c
@@ -13,7 +13,8 @@
* Incoming messages are read directly off the wire, as it were, but there
* are still data-conversion tasks to be performed.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/libpq/pqpacket.c b/src/backend/libpq/pqpacket.c
index dcf5a261b1..9da977a0cc 100644
--- a/src/backend/libpq/pqpacket.c
+++ b/src/backend/libpq/pqpacket.c
@@ -4,7 +4,8 @@
* routines for reading and writing data packets sent/received by
* POSTGRES clients and servers
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/libpq/pqsignal.c b/src/backend/libpq/pqsignal.c
index 2de32dc2aa..eda3019dcd 100644
--- a/src/backend/libpq/pqsignal.c
+++ b/src/backend/libpq/pqsignal.c
@@ -4,7 +4,8 @@
* reliable BSD-style signal(2) routine stolen from RWW who stole it
* from Stevens...
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/libpq/util.c b/src/backend/libpq/util.c
index 0aa86bd47f..2ae1b56cd0 100644
--- a/src/backend/libpq/util.c
+++ b/src/backend/libpq/util.c
@@ -3,7 +3,8 @@
* util.c
* general routines for libpq backend
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index 182b6900eb..8defb5ef6b 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -3,7 +3,8 @@
* main.c
* Stub main() routine for the postgres backend.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index e4055469f3..4e63d4bfc8 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -3,7 +3,8 @@
* copyfuncs.c
* Copy functions for Postgres tree nodes.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index d2569ba0e3..b36d65e55e 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -3,7 +3,8 @@
* equalfuncs.c
* equality functions to compare node trees
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/nodes/freefuncs.c b/src/backend/nodes/freefuncs.c
index 24015251cd..001b84537c 100644
--- a/src/backend/nodes/freefuncs.c
+++ b/src/backend/nodes/freefuncs.c
@@ -3,7 +3,8 @@
* freefuncs.c
* Free functions for Postgres tree nodes.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/nodes/list.c b/src/backend/nodes/list.c
index 882b792ed6..8104d005e2 100644
--- a/src/backend/nodes/list.c
+++ b/src/backend/nodes/list.c
@@ -3,7 +3,8 @@
* list.c
* various list handling routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c
index 9c9db6bb23..4366075c84 100644
--- a/src/backend/nodes/makefuncs.c
+++ b/src/backend/nodes/makefuncs.c
@@ -3,7 +3,8 @@
* creator functions for primitive nodes. The functions here are for
* the most frequently created nodes.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index df81d71fa0..8354c7443c 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -3,7 +3,8 @@
* nodeFuncs.c
* All node routines more complicated than simple access/modification
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/nodes/nodes.c b/src/backend/nodes/nodes.c
index 415850836b..6d90144f9e 100644
--- a/src/backend/nodes/nodes.c
+++ b/src/backend/nodes/nodes.c
@@ -4,7 +4,8 @@
* support code for nodes (now that we get rid of the home-brew
* inheritance system, our support code for nodes get much simpler)
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 930b662a5f..9cf980975a 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -3,7 +3,8 @@
* outfuncs.c
* routines to convert a node to ascii representation
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Header$
*
diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c
index 31395c740d..3cb59ef399 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -3,7 +3,8 @@
* print.c
* various print routines (used mostly for debugging)
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/nodes/read.c b/src/backend/nodes/read.c
index 653aabcc78..51f7db0cc2 100644
--- a/src/backend/nodes/read.c
+++ b/src/backend/nodes/read.c
@@ -4,7 +4,8 @@
* routines to convert a string (legal ascii representation of node) back
* to nodes
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index 05b31708a1..22410d0890 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -3,7 +3,8 @@
* readfuncs.c
* Reader functions for Postgres tree nodes.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/geqo/geqo_copy.c b/src/backend/optimizer/geqo/geqo_copy.c
index ab38a5fc6e..27c52b4896 100644
--- a/src/backend/optimizer/geqo/geqo_copy.c
+++ b/src/backend/optimizer/geqo/geqo_copy.c
@@ -2,7 +2,8 @@
*
* geqo_copy.c
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c
index d482c2dc29..d839ff1fbc 100644
--- a/src/backend/optimizer/geqo/geqo_eval.c
+++ b/src/backend/optimizer/geqo/geqo_eval.c
@@ -3,7 +3,8 @@
* geqo_eval.c
* Routines to evaluate query trees
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/optimizer/geqo/geqo_main.c b/src/backend/optimizer/geqo/geqo_main.c
index 6ae9853598..28a26f6ad9 100644
--- a/src/backend/optimizer/geqo/geqo_main.c
+++ b/src/backend/optimizer/geqo/geqo_main.c
@@ -4,7 +4,8 @@
* solution of the query optimization problem
* by means of a Genetic Algorithm (GA)
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/optimizer/geqo/geqo_misc.c b/src/backend/optimizer/geqo/geqo_misc.c
index d0f34fbb9f..70152cb9e3 100644
--- a/src/backend/optimizer/geqo/geqo_misc.c
+++ b/src/backend/optimizer/geqo/geqo_misc.c
@@ -3,7 +3,8 @@
* geqo_misc.c
* misc. printout and debug stuff
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/optimizer/geqo/geqo_params.c b/src/backend/optimizer/geqo/geqo_params.c
index 9c25c0d759..aacc39da17 100644
--- a/src/backend/optimizer/geqo/geqo_params.c
+++ b/src/backend/optimizer/geqo/geqo_params.c
@@ -3,7 +3,8 @@
* geqo_params.c
* routines for determining necessary genetic optimization parameters
*
-* Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/optimizer/geqo/geqo_pool.c b/src/backend/optimizer/geqo/geqo_pool.c
index ac5aa76d6e..508dc2d1c7 100644
--- a/src/backend/optimizer/geqo/geqo_pool.c
+++ b/src/backend/optimizer/geqo/geqo_pool.c
@@ -3,7 +3,8 @@
* geqo_pool.c
* Genetic Algorithm (GA) pool stuff
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/optimizer/geqo/geqo_selection.c b/src/backend/optimizer/geqo/geqo_selection.c
index f33f8e5004..59200c258b 100644
--- a/src/backend/optimizer/geqo/geqo_selection.c
+++ b/src/backend/optimizer/geqo/geqo_selection.c
@@ -3,7 +3,8 @@
* geqo_selection.c
* linear selection scheme for the genetic query optimizer
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/optimizer/geqo/minspantree.c b/src/backend/optimizer/geqo/minspantree.c
index 18a9126f3d..5d8228ef51 100644
--- a/src/backend/optimizer/geqo/minspantree.c
+++ b/src/backend/optimizer/geqo/minspantree.c
@@ -3,7 +3,8 @@
* minspantree.c
* routine to sort a join graph which is including cycles
*
-* Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+* Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/path/_deadcode/predmig.c b/src/backend/optimizer/path/_deadcode/predmig.c
index 692af2ca21..3dad8f8cd7 100644
--- a/src/backend/optimizer/path/_deadcode/predmig.c
+++ b/src/backend/optimizer/path/_deadcode/predmig.c
@@ -3,7 +3,8 @@
* predmig.c
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/path/_deadcode/xfunc.c b/src/backend/optimizer/path/_deadcode/xfunc.c
index 9545ba14eb..f145bf1209 100644
--- a/src/backend/optimizer/path/_deadcode/xfunc.c
+++ b/src/backend/optimizer/path/_deadcode/xfunc.c
@@ -5,7 +5,8 @@
* Includes xfunc_trypullup(), which attempts early pullup of predicates
* to allow for maximal pruning.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 73d8ea7589..978fd5da02 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -3,7 +3,8 @@
* allpaths.c
* Routines to find possible search paths for processing a query
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index 12c95801c1..f97e980b86 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -3,7 +3,8 @@
* clausesel.c
* Routines to compute clause selectivities
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index 8304ff4ddf..04dfd0823e 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -15,7 +15,8 @@
* the cost to process a tuple of an index during an index scan.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header$
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index 5289abb5ac..2171c6a714 100644
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@ -4,7 +4,8 @@
* Routines to determine which indices are usable for scanning a
* given relation, and create IndexPaths accordingly.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c
index a910f1df22..0eaac60610 100644
--- a/src/backend/optimizer/path/joinpath.c
+++ b/src/backend/optimizer/path/joinpath.c
@@ -3,7 +3,8 @@
* joinpath.c
* Routines to find all possible paths for processing a set of joins
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c
index ce6d87082a..31bffc9bb9 100644
--- a/src/backend/optimizer/path/joinrels.c
+++ b/src/backend/optimizer/path/joinrels.c
@@ -3,7 +3,8 @@
* joinrels.c
* Routines to determine which relations should be joined
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/path/orindxpath.c b/src/backend/optimizer/path/orindxpath.c
index 384a9a2a6b..5f72287a82 100644
--- a/src/backend/optimizer/path/orindxpath.c
+++ b/src/backend/optimizer/path/orindxpath.c
@@ -3,7 +3,8 @@
* orindxpath.c
* Routines to find index paths that match a set of 'or' clauses
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c
index 99ef942b76..c201f386a8 100644
--- a/src/backend/optimizer/path/pathkeys.c
+++ b/src/backend/optimizer/path/pathkeys.c
@@ -3,7 +3,8 @@
* pathkeys.c
* Utilities for matching and building path keys
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/path/prune.c b/src/backend/optimizer/path/prune.c
index c531fb5682..34aa6d9497 100644
--- a/src/backend/optimizer/path/prune.c
+++ b/src/backend/optimizer/path/prune.c
@@ -3,7 +3,8 @@
* prune.c
* Routines to prune redundant paths and relations
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/path/tidpath.c b/src/backend/optimizer/path/tidpath.c
index 86ffd49430..11181a6218 100644
--- a/src/backend/optimizer/path/tidpath.c
+++ b/src/backend/optimizer/path/tidpath.c
@@ -4,7 +4,8 @@
* Routines to determine which tids are usable for scanning a
* given relation, and create TidPaths accordingly.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 8951e435fc..85878a359e 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -5,7 +5,8 @@
* Planning is complete, we just need to convert the selected
* Path into a Plan.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 1789253666..6a686639a2 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -3,7 +3,8 @@
* initsplan.c
* Target list, qualification, joininfo initialization routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c
index f5b38daedf..be1ed028ec 100644
--- a/src/backend/optimizer/plan/planmain.c
+++ b/src/backend/optimizer/plan/planmain.c
@@ -3,7 +3,8 @@
* planmain.c
* Routines to plan a single query
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index b64d8d1e27..b7afc4a3e7 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -3,7 +3,8 @@
* planner.c
* The query optimizer external interface.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 77d615f81f..5d39b11a80 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -4,7 +4,8 @@
* Post-processing of a completed plan tree: fix references to subplan
* vars, and compute regproc values for operators
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c
index 5008e540c2..fcac2b0d43 100644
--- a/src/backend/optimizer/plan/subselect.c
+++ b/src/backend/optimizer/plan/subselect.c
@@ -3,7 +3,8 @@
* subselect.c
* Planning routines for subselects and parameters.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header$
diff --git a/src/backend/optimizer/prep/prepkeyset.c b/src/backend/optimizer/prep/prepkeyset.c
index 9a8ef5da4f..127505597a 100644
--- a/src/backend/optimizer/prep/prepkeyset.c
+++ b/src/backend/optimizer/prep/prepkeyset.c
@@ -3,7 +3,8 @@
* prepkeyset.c
* Special preperation for keyset queries.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*-------------------------------------------------------------------------
*/
diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c
index 1ab514f838..db42bc994b 100644
--- a/src/backend/optimizer/prep/prepqual.c
+++ b/src/backend/optimizer/prep/prepqual.c
@@ -3,7 +3,8 @@
* prepqual.c
* Routines for preprocessing qualification expressions
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index 840a8e2a64..3850fec23e 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -11,7 +11,8 @@
* executor relies on this to find the tuple to be replaced/deleted.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header$
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index d260b61bb9..a0ef5a27b2 100644
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -3,7 +3,8 @@
* prepunion.c
* Routines to plan inheritance, union, and version queries
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index 9e4c724aad..225589a8d4 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -3,7 +3,8 @@
* clauses.c
* routines to manipulate qualification clauses
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/util/indexnode.c b/src/backend/optimizer/util/indexnode.c
index f5564ec4cf..c166b123f0 100644
--- a/src/backend/optimizer/util/indexnode.c
+++ b/src/backend/optimizer/util/indexnode.c
@@ -3,7 +3,8 @@
* indexnode.c
* Routines to find all indices on a relation
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c
index 4da07a210e..e86e59dc33 100644
--- a/src/backend/optimizer/util/joininfo.c
+++ b/src/backend/optimizer/util/joininfo.c
@@ -3,7 +3,8 @@
* joininfo.c
* JoinInfo node manipulation routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index ddba627279..2d704c522f 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -3,7 +3,8 @@
* pathnode.c
* Routines to manipulate pathlists and create path nodes
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index 7b0f29e281..6cd79a9c45 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -4,7 +4,8 @@
* routines for accessing the system catalogs
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c
index 0a706221e6..e06207cc3c 100644
--- a/src/backend/optimizer/util/relnode.c
+++ b/src/backend/optimizer/util/relnode.c
@@ -3,7 +3,8 @@
* relnode.c
* Relation manipulation routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/util/restrictinfo.c b/src/backend/optimizer/util/restrictinfo.c
index 6d447e5655..74a8773601 100644
--- a/src/backend/optimizer/util/restrictinfo.c
+++ b/src/backend/optimizer/util/restrictinfo.c
@@ -3,7 +3,8 @@
* restrictinfo.c
* RestrictInfo node manipulation routines.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index 934e226d38..2bbc5cf018 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -3,7 +3,8 @@
* tlist.c
* Target list manipulation routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
index 178f20cc10..8fe38648d3 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -3,7 +3,8 @@
* var.c
* Var node manipulation routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 6937e4711c..2c1b70f684 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -3,7 +3,8 @@
* analyze.c
* transform the parse tree into a query tree
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 131454e5d1..1a4be0c820 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -6,7 +6,8 @@
* gram.y
* POSTGRES SQL YACC rules/actions
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/parser/keywords.c b/src/backend/parser/keywords.c
index d0c8c829cd..c8d76bad90 100644
--- a/src/backend/parser/keywords.c
+++ b/src/backend/parser/keywords.c
@@ -3,7 +3,8 @@
* keywords.c
* lexical token lookup for reserved words in postgres SQL
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c
index 3921f8af5d..ded7d98fae 100644
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -3,7 +3,8 @@
* parse_agg.c
* handle aggregates in parser
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 18ab3d85ab..b94447aad1 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -3,7 +3,8 @@
* parse_clause.c
* handle clauses in parser
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index c64813d451..4d3c29724f 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -3,7 +3,8 @@
* parse_coerce.c
* handle type coersions/conversions for parser
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 493650fc78..979832df80 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -3,7 +3,8 @@
* parse_expr.c
* handle expressions in parser
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index 8aeab4cdad..28a493ac29 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -3,7 +3,8 @@
* parse_func.c
* handle function calls in parser
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index fe69f287f4..71b6b4a338 100644
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -3,7 +3,8 @@
* parse_node.c
* various routines that make nodes for query plans
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index c6d3b6a7e2..6b36d39ca2 100644
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -3,7 +3,8 @@
* parse_oper.h
* handle operator things for parser
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 7b0a509075..6b01eef664 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -3,7 +3,8 @@
* parse_relation.c
* parser support routines dealing with relations
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index 29b8e4709f..dd308eeb91 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -3,7 +3,8 @@
* parse_target.c
* handle target lists
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index bca63affdf..429e96f820 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -3,7 +3,8 @@
* parse_type.c
* handle type operations for parser
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c
index 98839d4330..9336b5efa7 100644
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -2,7 +2,8 @@
*
* parser.c
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index 0ea7db209e..e51f4f4e27 100644
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -4,7 +4,8 @@
* scan.l
* lexical scanner for POSTGRES
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c
index a8750b9e42..a2f284fa2d 100644
--- a/src/backend/parser/scansup.c
+++ b/src/backend/parser/scansup.c
@@ -4,7 +4,8 @@
* support routines for the lex/flex scanner, used by both the normal
* backend as well as the bootstrap backend
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/port/dynloader/alpha.h b/src/backend/port/dynloader/alpha.h
index 07313b1f34..8266b4f536 100644
--- a/src/backend/port/dynloader/alpha.h
+++ b/src/backend/port/dynloader/alpha.h
@@ -4,7 +4,8 @@
* prototypes for OSF/1-specific routines
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/port/dynloader/bsd.c b/src/backend/port/dynloader/bsd.c
index f9f8d3e8d3..b77dea182f 100644
--- a/src/backend/port/dynloader/bsd.c
+++ b/src/backend/port/dynloader/bsd.c
@@ -1,5 +1,6 @@
/*-
- * Copyright (c) 1990 The Regents of the University of California.
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/backend/port/dynloader/bsd.h b/src/backend/port/dynloader/bsd.h
index 22b21586e8..5195d04108 100644
--- a/src/backend/port/dynloader/bsd.h
+++ b/src/backend/port/dynloader/bsd.h
@@ -4,7 +4,8 @@
* port-specific prototypes for NetBSD 1.0
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/port/dynloader/bsdi.c b/src/backend/port/dynloader/bsdi.c
index 7c99fb8e07..5ab9c1005a 100644
--- a/src/backend/port/dynloader/bsdi.c
+++ b/src/backend/port/dynloader/bsdi.c
@@ -6,7 +6,8 @@
*
* You need to install the dld library on your Linux system!
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/port/dynloader/bsdi.h b/src/backend/port/dynloader/bsdi.h
index a9b01fce22..5c8b3058aa 100644
--- a/src/backend/port/dynloader/bsdi.h
+++ b/src/backend/port/dynloader/bsdi.h
@@ -4,7 +4,8 @@
* port-specific prototypes for SunOS 4
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* port_protos.h,v 1.2 1995/05/25 22:51:03 andrew Exp
*
diff --git a/src/backend/port/dynloader/dgux.h b/src/backend/port/dynloader/dgux.h
index 3a2fbf0d5d..b4b1e4284d 100644
--- a/src/backend/port/dynloader/dgux.h
+++ b/src/backend/port/dynloader/dgux.h
@@ -2,7 +2,8 @@
*
* dgux.h
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/port/dynloader/freebsd.c b/src/backend/port/dynloader/freebsd.c
index 0d121cb484..9f7f7110f8 100644
--- a/src/backend/port/dynloader/freebsd.c
+++ b/src/backend/port/dynloader/freebsd.c
@@ -1,5 +1,6 @@
/*-
- * Copyright (c) 1990 The Regents of the University of California.
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/backend/port/dynloader/freebsd.h b/src/backend/port/dynloader/freebsd.h
index b9dc93985c..e7c0c95413 100644
--- a/src/backend/port/dynloader/freebsd.h
+++ b/src/backend/port/dynloader/freebsd.h
@@ -4,7 +4,8 @@
* port-specific prototypes for NetBSD 1.0
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/port/dynloader/hpux.c b/src/backend/port/dynloader/hpux.c
index a52f39a717..d29382c484 100644
--- a/src/backend/port/dynloader/hpux.c
+++ b/src/backend/port/dynloader/hpux.c
@@ -3,7 +3,8 @@
* dynloader.c
* dynamic loader for HP-UX using the shared library mechanism
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/port/dynloader/hpux.h b/src/backend/port/dynloader/hpux.h
index d91175717c..96134f822f 100644
--- a/src/backend/port/dynloader/hpux.h
+++ b/src/backend/port/dynloader/hpux.h
@@ -3,7 +3,8 @@
* dynloader.h
* dynamic loader for HP-UX using the shared library mechanism
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/port/dynloader/irix5.h b/src/backend/port/dynloader/irix5.h
index 654f8d8e91..53dc6eb430 100644
--- a/src/backend/port/dynloader/irix5.h
+++ b/src/backend/port/dynloader/irix5.h
@@ -4,7 +4,8 @@
* port-specific prototypes for Irix 5
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* port_protos.h,v 1.2 1995/03/17 06:40:18 andrew Exp
*
diff --git a/src/backend/port/dynloader/linux.c b/src/backend/port/dynloader/linux.c
index d80a689ac4..05c6f9b29b 100644
--- a/src/backend/port/dynloader/linux.c
+++ b/src/backend/port/dynloader/linux.c
@@ -6,7 +6,8 @@
*
* You need to install the dld library on your Linux system!
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/port/dynloader/linux.h b/src/backend/port/dynloader/linux.h
index cd1f1c3d20..0a66242734 100644
--- a/src/backend/port/dynloader/linux.h
+++ b/src/backend/port/dynloader/linux.h
@@ -4,7 +4,8 @@
* port-specific prototypes for Linux
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/port/dynloader/sco.h b/src/backend/port/dynloader/sco.h
index c2fac7d9c1..5d0c366490 100644
--- a/src/backend/port/dynloader/sco.h
+++ b/src/backend/port/dynloader/sco.h
@@ -4,7 +4,8 @@
* port-specific prototypes for SCO 3.2v5.2
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/port/dynloader/solaris_i386.h b/src/backend/port/dynloader/solaris_i386.h
index 6c86b2d711..4f49bf1219 100755
--- a/src/backend/port/dynloader/solaris_i386.h
+++ b/src/backend/port/dynloader/solaris_i386.h
@@ -4,7 +4,8 @@
* port-specific prototypes for SunOS 4
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/port/dynloader/solaris_sparc.h b/src/backend/port/dynloader/solaris_sparc.h
index fef10997fd..a85e5161f4 100755
--- a/src/backend/port/dynloader/solaris_sparc.h
+++ b/src/backend/port/dynloader/solaris_sparc.h
@@ -4,7 +4,8 @@
* port-specific prototypes for SunOS 4
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/port/dynloader/sunos4.h b/src/backend/port/dynloader/sunos4.h
index 40aaf18f5f..d39c2d4cef 100644
--- a/src/backend/port/dynloader/sunos4.h
+++ b/src/backend/port/dynloader/sunos4.h
@@ -4,7 +4,8 @@
* port-specific prototypes for SunOS 4
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/port/dynloader/svr4.h b/src/backend/port/dynloader/svr4.h
index a90ff2e6fb..04fb728350 100644
--- a/src/backend/port/dynloader/svr4.h
+++ b/src/backend/port/dynloader/svr4.h
@@ -4,7 +4,8 @@
* port-specific prototypes for Intel x86/Intel SVR4
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/port/dynloader/ultrix4.c b/src/backend/port/dynloader/ultrix4.c
index c18f992cac..85f45d404f 100644
--- a/src/backend/port/dynloader/ultrix4.c
+++ b/src/backend/port/dynloader/ultrix4.c
@@ -5,7 +5,8 @@
* (Note that pg_dlsym and pg_dlclose are actually macros defined in
* "port-protos.h".)
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/port/dynloader/ultrix4.h b/src/backend/port/dynloader/ultrix4.h
index 9300451338..9a3c91c8f8 100644
--- a/src/backend/port/dynloader/ultrix4.h
+++ b/src/backend/port/dynloader/ultrix4.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/port/dynloader/univel.h b/src/backend/port/dynloader/univel.h
index e85c6a4c08..a69c2c75a0 100644
--- a/src/backend/port/dynloader/univel.h
+++ b/src/backend/port/dynloader/univel.h
@@ -4,7 +4,8 @@
* port-specific prototypes for Intel x86/UNIXWARE
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* univel.h,v 1.2 1995/03/17 06:40:18 andrew Exp
*
diff --git a/src/backend/port/dynloader/unixware.h b/src/backend/port/dynloader/unixware.h
index 5e00a5c4a1..9b7780831a 100644
--- a/src/backend/port/dynloader/unixware.h
+++ b/src/backend/port/dynloader/unixware.h
@@ -4,7 +4,8 @@
* port-specific prototypes for Intel x86/UNIXWARE 7
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* unixware.h,v 1.2 1995/03/17 06:40:18 andrew Exp
*
diff --git a/src/backend/port/dynloader/win.h b/src/backend/port/dynloader/win.h
index c736935454..603d1b52dd 100644
--- a/src/backend/port/dynloader/win.h
+++ b/src/backend/port/dynloader/win.h
@@ -4,7 +4,8 @@
* port-specific prototypes for Intel x86/Window NT
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* win.h,v 1.2 1995/03/17 06:40:18 andrew Exp
*
diff --git a/src/backend/port/hpux/fixade.h b/src/backend/port/hpux/fixade.h
index 531a782df7..817b8584d4 100644
--- a/src/backend/port/hpux/fixade.h
+++ b/src/backend/port/hpux/fixade.h
@@ -5,7 +5,8 @@
* dereferences on PA-RISC.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/port/hpux/port-protos.h b/src/backend/port/hpux/port-protos.h
index 0a0dcbee61..10badebb65 100644
--- a/src/backend/port/hpux/port-protos.h
+++ b/src/backend/port/hpux/port-protos.h
@@ -4,7 +4,8 @@
* port-specific prototypes for HP-UX
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/port/strcasecmp.c b/src/backend/port/strcasecmp.c
index 3774793c61..9db72214f6 100644
--- a/src/backend/port/strcasecmp.c
+++ b/src/backend/port/strcasecmp.c
@@ -1,7 +1,8 @@
/* $Id$ */
/*
- * Copyright (c) 1987 Regents of the University of California.
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1987 Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
diff --git a/src/backend/port/strtol.c b/src/backend/port/strtol.c
index 215bf616f9..16ae290d29 100644
--- a/src/backend/port/strtol.c
+++ b/src/backend/port/strtol.c
@@ -1,5 +1,6 @@
/*-
- * Copyright (c) 1990 The Regents of the University of California.
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/backend/port/sunos4/float.h b/src/backend/port/sunos4/float.h
index f8a1eafb36..b0e6b9bf0f 100644
--- a/src/backend/port/sunos4/float.h
+++ b/src/backend/port/sunos4/float.h
@@ -4,7 +4,8 @@
* definitions for ANSI floating point
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index e2707d6dda..6833f2a280 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -6,7 +6,8 @@
* to the Postmaster and the postmaster uses the info in the
* message to setup a backend process.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/rewrite/locks.c b/src/backend/rewrite/locks.c
index b2a9b8d2c6..cec4a44def 100644
--- a/src/backend/rewrite/locks.c
+++ b/src/backend/rewrite/locks.c
@@ -2,7 +2,8 @@
*
* locks.c
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index 20a34f5990..fe0162c675 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -3,7 +3,8 @@
* rewriteDefine.c
* routines for defining a rewrite rule
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index becb9cfe03..059a5959ac 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -2,7 +2,8 @@
*
* rewriteHandler.c
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index a4e8b23d63..c629323412 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -2,7 +2,8 @@
*
* rewriteManip.c
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c
index b99d560e14..98d533eb2e 100644
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -3,7 +3,8 @@
* rewriteRemove.c
* routines for removing rewrite rules
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c
index e3aa232bbc..4593b70e5b 100644
--- a/src/backend/rewrite/rewriteSupport.c
+++ b/src/backend/rewrite/rewriteSupport.c
@@ -3,7 +3,8 @@
* rewriteSupport.c
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c
index 64e321911f..be6f470f42 100644
--- a/src/backend/storage/buffer/buf_init.c
+++ b/src/backend/storage/buffer/buf_init.c
@@ -3,7 +3,8 @@
* buf_init.c
* buffer manager initialization routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c
index b8c0b220f1..7c81f9be78 100644
--- a/src/backend/storage/buffer/buf_table.c
+++ b/src/backend/storage/buffer/buf_table.c
@@ -3,7 +3,8 @@
* buf_table.c
* routines for finding buffers in the buffer pool.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index af5b384560..ae12fb3777 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -3,7 +3,8 @@
* bufmgr.c
* buffer manager interface routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c
index 3b8b77e78d..2d0f17a597 100644
--- a/src/backend/storage/buffer/freelist.c
+++ b/src/backend/storage/buffer/freelist.c
@@ -4,7 +4,8 @@
* routines for manipulating the buffer pool's replacement strategy
* freelist.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c
index 42b82c698d..af1cd051ec 100644
--- a/src/backend/storage/buffer/localbuf.c
+++ b/src/backend/storage/buffer/localbuf.c
@@ -11,7 +11,8 @@
* pool. rd_islocal is reset at the end of a transaction (commit/abort).
* This is useful for queries like SELECT INTO TABLE and create index.
*
- * Copyright (c) 1994-5, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994-5, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/buffer/s_lock.c b/src/backend/storage/buffer/s_lock.c
index d6041011c0..f39a22753b 100644
--- a/src/backend/storage/buffer/s_lock.c
+++ b/src/backend/storage/buffer/s_lock.c
@@ -3,7 +3,8 @@
* s_lock.c
* buffer manager interface routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c
index f74c8ad885..e0910aae74 100644
--- a/src/backend/storage/file/buffile.c
+++ b/src/backend/storage/file/buffile.c
@@ -3,7 +3,8 @@
* buffile.c
* Management of large buffered files, primarily temporary files.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header$
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index d592df565d..a9a89e7a81 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -3,7 +3,8 @@
* fd.c
* Virtual file descriptor code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header$
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index 89b409f92e..ff392880ce 100644
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -3,7 +3,8 @@
* ipc.c
* POSTGRES inter-process communication definitions.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index 1df867b88d..7596ddf234 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -3,7 +3,8 @@
* ipci.c
* POSTGRES inter-process communication initialization code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index b6b0d72220..950728f0fb 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -3,7 +3,8 @@
* shmem.c
* create shared memory and initialize shared memory data structures.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c
index 0d9813bcc1..323982f902 100644
--- a/src/backend/storage/ipc/shmqueue.c
+++ b/src/backend/storage/ipc/shmqueue.c
@@ -3,7 +3,8 @@
* shmqueue.c
* shared memory linked lists
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c
index 07ecb123b5..f02ba40204 100644
--- a/src/backend/storage/ipc/sinval.c
+++ b/src/backend/storage/ipc/sinval.c
@@ -3,7 +3,8 @@
* sinval.c
* POSTGRES shared cache invalidation communication code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index 8c1ae50c24..c040002220 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -3,7 +3,8 @@
* sinvaladt.c
* POSTGRES shared cache invalidation segment definitions.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/ipc/spin.c b/src/backend/storage/ipc/spin.c
index d8e7d2f4ca..d1115ce6ba 100644
--- a/src/backend/storage/ipc/spin.c
+++ b/src/backend/storage/ipc/spin.c
@@ -3,7 +3,8 @@
* spin.c
* routines for managing spin locks
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index f608f02832..a40234cb3c 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -4,7 +4,8 @@
* routines for manipulating inversion fs large objects. This file
* contains the user-level large object application interface routines.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index 6284703d4e..8962823cba 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -3,7 +3,8 @@
* lmgr.c
* POSTGRES lock manager code
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index f199a039cc..78182343c1 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -3,7 +3,8 @@
* lock.c
* simple lock acquisition
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c
index d7a88a18d0..cf06eeadc8 100644
--- a/src/backend/storage/lmgr/multi.c
+++ b/src/backend/storage/lmgr/multi.c
@@ -8,7 +8,8 @@
* three levels -- RELN, PAGE, TUPLE. Tuple is actually TID
* a physical record pointer. It isn't an object id.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index d111d9fd9f..c55b582167 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -3,7 +3,8 @@
* proc.c
* routines to manage per-process shared memory data structure
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/lmgr/single.c b/src/backend/storage/lmgr/single.c
index 18e318d3b7..d607cfa467 100644
--- a/src/backend/storage/lmgr/single.c
+++ b/src/backend/storage/lmgr/single.c
@@ -9,7 +9,8 @@
* you can set an intent lock at the beginning and thereafter
* only set page locks. Tends to speed things up.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index 052db9bcbb..e9fdad286d 100644
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -3,7 +3,8 @@
* bufpage.c
* POSTGRES standard buffer page code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/page/itemptr.c b/src/backend/storage/page/itemptr.c
index 800636218c..bc2d15884d 100644
--- a/src/backend/storage/page/itemptr.c
+++ b/src/backend/storage/page/itemptr.c
@@ -3,7 +3,8 @@
* itemptr.c
* POSTGRES disk item pointer code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index a402875ad4..82346a0948 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -3,7 +3,8 @@
* md.c
* This code manages relations that reside on magnetic disk.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/smgr/mm.c b/src/backend/storage/smgr/mm.c
index 0735707793..2920741f0f 100644
--- a/src/backend/storage/smgr/mm.c
+++ b/src/backend/storage/smgr/mm.c
@@ -6,7 +6,8 @@
* This code manages relations that reside in (presumably stable)
* main memory.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index 6630b2c9cd..eb4d1ba12c 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -6,7 +6,8 @@
* All file system operations in POSTGRES dispatch through these
* routines.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/storage/smgr/smgrtype.c b/src/backend/storage/smgr/smgrtype.c
index 8ed09b23c6..dd0cab261a 100644
--- a/src/backend/storage/smgr/smgrtype.c
+++ b/src/backend/storage/smgr/smgrtype.c
@@ -3,7 +3,8 @@
* smgrtype.c
* storage manager type
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index aff37bdf50..b1e582df4b 100644
--- a/src/backend/tcop/dest.c
+++ b/src/backend/tcop/dest.c
@@ -3,7 +3,8 @@
* dest.c
* support for various communication destinations - see include/tcop/dest.h
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
index abf21e8ed5..dee3de7062 100644
--- a/src/backend/tcop/fastpath.c
+++ b/src/backend/tcop/fastpath.c
@@ -3,7 +3,8 @@
* fastpath.c
* routines to handle function requests from the frontend
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 7790a7462e..86ca3ff0b9 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -3,7 +3,8 @@
* postgres.c
* POSTGRES C Backend Interface
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
@@ -1515,7 +1516,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
if (!IsUnderPostmaster)
{
puts("\nPOSTGRES backend interactive interface ");
- puts("$Revision: 1.140 $ $Date: 2000/01/22 23:50:18 $\n");
+ puts("$Revision: 1.141 $ $Date: 2000/01/26 05:57:07 $\n");
}
/*
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index 60793c8d7a..580bc63407 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -3,7 +3,8 @@
* pquery.c
* POSTGRES process query command code
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 15ecac4298..08f67ca91f 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -5,7 +5,8 @@
* commands. At one time acted as an interface between the Lisp and C
* systems.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/tioga/tgRecipe.c b/src/backend/tioga/tgRecipe.c
index 520e260551..85641d9af1 100644
--- a/src/backend/tioga/tgRecipe.c
+++ b/src/backend/tioga/tgRecipe.c
@@ -7,7 +7,8 @@
*
* this file must be kept current with recipe-schema.sql
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/tioga/tgRecipe.h b/src/backend/tioga/tgRecipe.h
index 01b58d9535..6205131506 100644
--- a/src/backend/tioga/tgRecipe.h
+++ b/src/backend/tioga/tgRecipe.h
@@ -9,7 +9,8 @@
* "utils/geo-decls.h"
* and "libpq/libpq.h"
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index c8d02a594d..95bb08d936 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -3,7 +3,8 @@
* acl.c
* Basic access control list data structures manipulation routines.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index 269c3efe51..9e21abefea 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -3,7 +3,8 @@
* arrayfuncs.c
* Special functions for arrays.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/arrayutils.c b/src/backend/utils/adt/arrayutils.c
index 906b05a159..3d67f61e66 100644
--- a/src/backend/utils/adt/arrayutils.c
+++ b/src/backend/utils/adt/arrayutils.c
@@ -3,7 +3,8 @@
* arrayutils.c
* This file contains some support routines required for array functions.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/bool.c b/src/backend/utils/adt/bool.c
index 3ea29bfafd..d7ecb7e923 100644
--- a/src/backend/utils/adt/bool.c
+++ b/src/backend/utils/adt/bool.c
@@ -3,7 +3,8 @@
* bool.c
* Functions for the built-in type "bool".
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c
index 0fb3d036f3..247c335e93 100644
--- a/src/backend/utils/adt/char.c
+++ b/src/backend/utils/adt/char.c
@@ -4,7 +4,8 @@
* Functions for the built-in type "char".
* Functions for the built-in type "cid".
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/chunk.c b/src/backend/utils/adt/chunk.c
index 4238b04efe..cb254f503b 100644
--- a/src/backend/utils/adt/chunk.c
+++ b/src/backend/utils/adt/chunk.c
@@ -2,7 +2,8 @@
*
* chunk.c
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index 953f011774..78cfdb161e 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -5,7 +5,8 @@
* Functions for the built-in type "RelativeTime".
* Functions for the built-in type "TimeInterval".
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index de7cf93087..6fc3caaaf0 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -3,7 +3,8 @@
* datetime.c
* implements DATE and TIME data types specified in SQL-92 standard
*
- * Copyright (c) 1994-5, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994-5, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/datum.c b/src/backend/utils/adt/datum.c
index 78789b3217..b80d13f405 100644
--- a/src/backend/utils/adt/datum.c
+++ b/src/backend/utils/adt/datum.c
@@ -2,7 +2,8 @@
*
* datum.c
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/dt.c b/src/backend/utils/adt/dt.c
index 162821822a..716158e2fd 100644
--- a/src/backend/utils/adt/dt.c
+++ b/src/backend/utils/adt/dt.c
@@ -3,7 +3,8 @@
* dt.c
* Functions for the built-in type "dt".
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/filename.c b/src/backend/utils/adt/filename.c
index 9d9f031c42..6a3ed8b1ae 100644
--- a/src/backend/utils/adt/filename.c
+++ b/src/backend/utils/adt/filename.c
@@ -3,7 +3,8 @@
* filename.c
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index 0534017758..e4bced6a60 100644
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -3,7 +3,8 @@
* float.c
* Functions for the built-in floating-point types.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
index 83912cf7c4..72ed32347f 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -3,7 +3,8 @@
* geo_ops.c
* 2D geometric operations
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/geo_selfuncs.c b/src/backend/utils/adt/geo_selfuncs.c
index 88ddeea028..e1e78496e7 100644
--- a/src/backend/utils/adt/geo_selfuncs.c
+++ b/src/backend/utils/adt/geo_selfuncs.c
@@ -4,7 +4,8 @@
* Selectivity routines registered in the operator catalog in the
* "oprrest" and "oprjoin" attributes.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index 2259591615..9625dc03b0 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -3,7 +3,8 @@
* int.c
* Functions for the built-in integer types.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c
index 9eee4b0abc..db80023a07 100644
--- a/src/backend/utils/adt/like.c
+++ b/src/backend/utils/adt/like.c
@@ -7,7 +7,8 @@
* A big hack of the regexp.c code!! Contributed by
* Keith Parks <[email protected]> (7/95).
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header$
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index c71f8ddcb8..fb4ec045de 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -3,7 +3,8 @@
* misc.c
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index c77adf6e28..ef5de757c0 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -2,7 +2,8 @@
* nabstime.c
* parse almost any absolute date getdate(3) can (& some it can't)
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c
index 933ccbd3b0..63715e7520 100644
--- a/src/backend/utils/adt/name.c
+++ b/src/backend/utils/adt/name.c
@@ -7,7 +7,8 @@
* always use NAMEDATALEN as the symbolic constant! - jolly 8/21/95
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/not_in.c b/src/backend/utils/adt/not_in.c
index 41642e0e60..4f221d45c5 100644
--- a/src/backend/utils/adt/not_in.c
+++ b/src/backend/utils/adt/not_in.c
@@ -3,7 +3,8 @@
* not_in.c
* Executes the "not_in" operator for any data type
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index e748499e43..0c83fa381b 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -6,7 +6,8 @@
* integer: itoa, ltoa
* floating point: ftoa, atof1
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c
index d151170984..0a5db26a25 100644
--- a/src/backend/utils/adt/oid.c
+++ b/src/backend/utils/adt/oid.c
@@ -3,7 +3,8 @@
* oid.c
* Functions for the built-in type Oid.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c
index 6eb9847e55..e44290be31 100644
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -3,7 +3,8 @@
* regexp.c
* regular expression handling code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index 01b7b8cc43..e2db07da30 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -3,7 +3,8 @@
* regproc.c
* Functions for the built-in type "RegProcedure".
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index 0860d507fa..e728a40509 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -10,7 +10,8 @@
* Index cost functions are registered in the pg_am catalog
* in the "amcostestimate" attribute.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c
index c7808a180a..304b4246b3 100644
--- a/src/backend/utils/adt/sets.c
+++ b/src/backend/utils/adt/sets.c
@@ -5,7 +5,8 @@
* Example: a set is defined as being the result of the query
* retrieve (X.all)
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c
index 9170c2b735..e6b1b39bbe 100644
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -3,7 +3,8 @@
* tid.c
* Functions for the built-in type tuple id
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index 17fbf9c5e2..7f0786eabb 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -3,7 +3,8 @@
* varchar.c
* Functions for the built-in type char() and varchar().
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index d704a8d19e..03b1f7177a 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -3,7 +3,8 @@
* varlena.c
* Functions for the variable-length built-in types.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index a4125b9836..9e4a09a5ee 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -3,7 +3,8 @@
* catcache.c
* System catalog cache for tuples matching a key.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/cache/fcache.c b/src/backend/utils/cache/fcache.c
index 0dda3156a5..2aed207a96 100644
--- a/src/backend/utils/cache/fcache.c
+++ b/src/backend/utils/cache/fcache.c
@@ -3,7 +3,8 @@
* fcache.c
* Code for the 'function cache' used in Oper and Func nodes....
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index a366bee60c..9e73f5f3d1 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -3,7 +3,8 @@
* inval.c
* POSTGRES cache invalidation dispatcher code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index a65152200b..ecf8d50d67 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -3,7 +3,8 @@
* lsyscache.c
* Convenience routines for common queries in the system catalog cache.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header$
diff --git a/src/backend/utils/cache/rel.c b/src/backend/utils/cache/rel.c
index 8f8f34005c..c8d3543565 100644
--- a/src/backend/utils/cache/rel.c
+++ b/src/backend/utils/cache/rel.c
@@ -3,7 +3,8 @@
* rel.c
* POSTGRES relation descriptor code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index df525836c5..7521636266 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -3,7 +3,8 @@
* relcache.c
* POSTGRES relation descriptor cache code
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 6b927385cf..e418865794 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -3,7 +3,8 @@
* syscache.c
* System cache management routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/cache/temprel.c b/src/backend/utils/cache/temprel.c
index c7b0af8a35..99c4e9b064 100644
--- a/src/backend/utils/cache/temprel.c
+++ b/src/backend/utils/cache/temprel.c
@@ -3,7 +3,8 @@
* temprel.c
* POSTGRES temporary relation handling
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/error/assert.c b/src/backend/utils/error/assert.c
index 41748e9405..e0f0b51d20 100644
--- a/src/backend/utils/error/assert.c
+++ b/src/backend/utils/error/assert.c
@@ -3,7 +3,8 @@
* assert.c
* Assert code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 23370399ba..3afbca0564 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -3,7 +3,8 @@
* elog.c
* error logger
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c
index 98059fd351..b6b9272879 100644
--- a/src/backend/utils/error/exc.c
+++ b/src/backend/utils/error/exc.c
@@ -3,7 +3,8 @@
* exc.c
* POSTGRES exception handling code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/error/excabort.c b/src/backend/utils/error/excabort.c
index e38639b44a..e62a7977e4 100644
--- a/src/backend/utils/error/excabort.c
+++ b/src/backend/utils/error/excabort.c
@@ -3,7 +3,8 @@
* excabort.c
* Default exception abort code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/error/excid.c b/src/backend/utils/error/excid.c
index bbf29aff3a..d50aadc759 100644
--- a/src/backend/utils/error/excid.c
+++ b/src/backend/utils/error/excid.c
@@ -3,7 +3,8 @@
* excid.c
* POSTGRES known exception identifier code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/error/format.c b/src/backend/utils/error/format.c
index 896ed39087..f1301004bb 100644
--- a/src/backend/utils/error/format.c
+++ b/src/backend/utils/error/format.c
@@ -3,7 +3,8 @@
* format.c
* a wrapper around code that does what vsprintf does.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index 4924e1a923..b81bf37130 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -3,7 +3,8 @@
* dfmgr.c
* Dynamic function manager code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
index 380a1833e5..29812df37e 100644
--- a/src/backend/utils/fmgr/fmgr.c
+++ b/src/backend/utils/fmgr/fmgr.c
@@ -3,7 +3,8 @@
* fmgr.c
* Interface routines for the table-driven function manager.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index f5b2db3af9..3c6ae2d3e5 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -3,7 +3,8 @@
* dynahash.c
* dynamic hashing
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/hash/hashfn.c b/src/backend/utils/hash/hashfn.c
index 090833e8ea..b53378f382 100644
--- a/src/backend/utils/hash/hashfn.c
+++ b/src/backend/utils/hash/hashfn.c
@@ -3,7 +3,8 @@
* hashfn.c
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/init/enbl.c b/src/backend/utils/init/enbl.c
index 6591246d27..fe5e715e6f 100644
--- a/src/backend/utils/init/enbl.c
+++ b/src/backend/utils/init/enbl.c
@@ -3,7 +3,8 @@
* enbl.c
* POSTGRES module enable and disable support code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/init/findbe.c b/src/backend/utils/init/findbe.c
index 8879210e70..0ca4b08d4a 100644
--- a/src/backend/utils/init/findbe.c
+++ b/src/backend/utils/init/findbe.c
@@ -2,7 +2,8 @@
*
* findbe.c
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index 44a3d52061..823a1b4c2c 100644
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -3,7 +3,8 @@
* globals.c
* global variable declarations
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index de07a1bc30..5478769063 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -3,7 +3,8 @@
* miscinit.c
* miscellanious initialization support stuff
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 8e0dba73c6..32cbe46bd0 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -3,7 +3,8 @@
* postinit.c
* postgres initialization utilities
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c
index 91094d3fc2..5e13c8f572 100644
--- a/src/backend/utils/misc/database.c
+++ b/src/backend/utils/misc/database.c
@@ -3,7 +3,8 @@
* database.c
* miscellaneous initialization support stuff
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/misc/superuser.c b/src/backend/utils/misc/superuser.c
index 03dd14f37a..00dff6294c 100644
--- a/src/backend/utils/misc/superuser.c
+++ b/src/backend/utils/misc/superuser.c
@@ -4,7 +4,8 @@
*
* The superuser() function. Determines if user has superuser privilege.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c
index 7ba108148f..1c9ce3a680 100644
--- a/src/backend/utils/mmgr/aset.c
+++ b/src/backend/utils/mmgr/aset.c
@@ -3,7 +3,8 @@
* aset.c
* Allocation set definitions.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index e2c58300ba..0140619c5a 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -3,7 +3,8 @@
* mcxt.c
* POSTGRES memory context code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/mmgr/oset.c b/src/backend/utils/mmgr/oset.c
index bd5f088bac..bd1cba370a 100644
--- a/src/backend/utils/mmgr/oset.c
+++ b/src/backend/utils/mmgr/oset.c
@@ -3,7 +3,8 @@
* oset.c
* Fixed format ordered set definitions.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/mmgr/palloc.c b/src/backend/utils/mmgr/palloc.c
index 1f8802d703..dadc5bb876 100644
--- a/src/backend/utils/mmgr/palloc.c
+++ b/src/backend/utils/mmgr/palloc.c
@@ -3,7 +3,8 @@
* palloc.c
* POSTGRES memory allocator code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
index baa31eba8b..ec3eb924c2 100644
--- a/src/backend/utils/mmgr/portalmem.c
+++ b/src/backend/utils/mmgr/portalmem.c
@@ -3,7 +3,8 @@
* portalmem.c
* backend portal memory context management stuff
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/sort/logtape.c b/src/backend/utils/sort/logtape.c
index b25bbefce7..00487525cd 100644
--- a/src/backend/utils/sort/logtape.c
+++ b/src/backend/utils/sort/logtape.c
@@ -60,7 +60,8 @@
* care that all calls for a single LogicalTapeSet are made in the same
* palloc context.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header$
diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c
index 38d7b0724c..33a9c06be5 100644
--- a/src/backend/utils/sort/tuplesort.c
+++ b/src/backend/utils/sort/tuplesort.c
@@ -74,7 +74,8 @@
* saves one cycle of writing all the data out to disk and reading it in.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header$
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
index 4ecb05f79a..669c501d0b 100644
--- a/src/backend/utils/time/tqual.c
+++ b/src/backend/utils/time/tqual.c
@@ -3,7 +3,8 @@
* tqual.c
* POSTGRES "time" qualification code.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index 2da42f95d7..3a297dca86 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -3,7 +3,8 @@
* common.c
* common routines between pg_dump and pg4_dump
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 1e9fa77a3a..5167f78fb1 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -17,7 +17,8 @@
*
* the output script is SQL that is understood by PostgreSQL
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
@@ -176,7 +177,8 @@ version(void)
{
puts("pg_dump (PostgreSQL) " PG_RELEASE "." PG_VERSION "." PG_SUBVERSION);
puts("Copyright (C) 2000 PostgreSQL Global Development Team");
- puts("Copyright (C) 1996 Regents of the University of California");
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ puts("Portions Copyright (C) 1996 Regents of the University of California");
puts("Read the file COPYING to see the usage and distribution terms.");
}
diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h
index e99c979b44..c811acbcbc 100644
--- a/src/bin/pg_dump/pg_dump.h
+++ b/src/bin/pg_dump/pg_dump.h
@@ -3,7 +3,8 @@
* pg_dump.h
* header file for the pg_dump utility
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/bin/pg_version/pg_version.c b/src/bin/pg_version/pg_version.c
index 35d554d650..93136b1b69 100644
--- a/src/bin/pg_version/pg_version.c
+++ b/src/bin/pg_version/pg_version.c
@@ -3,7 +3,8 @@
* pg_version.c
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/bin/pgtclsh/pgtclAppInit.c b/src/bin/pgtclsh/pgtclAppInit.c
index baebf4ce52..184c933475 100644
--- a/src/bin/pgtclsh/pgtclAppInit.c
+++ b/src/bin/pgtclsh/pgtclAppInit.c
@@ -4,7 +4,8 @@
* a skeletal Tcl_AppInit that provides pgtcl initialization
* to create a tclsh that can talk to pglite backends
*
- * Copyright (c) 1993 The Regents of the University of California.
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1993 The Regents of the University of California.
* Copyright (c) 1994 Sun Microsystems, Inc.
*
* See the file "license.terms" for information on usage and redistribution
diff --git a/src/bin/pgtclsh/pgtkAppInit.c b/src/bin/pgtclsh/pgtkAppInit.c
index 2c70b741cd..02ec10af6c 100644
--- a/src/bin/pgtclsh/pgtkAppInit.c
+++ b/src/bin/pgtclsh/pgtkAppInit.c
@@ -4,7 +4,8 @@
* a skeletal Tcl_AppInit that provides pgtcl initialization
* to create a tclsh that can talk to pglite backends
*
- * Copyright (c) 1993 The Regents of the University of California.
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1993 The Regents of the University of California.
* Copyright (c) 1994 Sun Microsystems, Inc.
*
* See the file "license.terms" for information on usage and redistribution
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 4e5b52b05d..f2c6023699 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -307,7 +307,8 @@ print_copyright(void)
"Copyright(c) 1996 - 9 PostgreSQL Global Development Group\n\n"
"This software is based on Postgres95, formerly known as Postgres, which\n"
"contains the following notice:\n\n"
- "Copyright(c) 1994 - 7 Regents of the University of California\n\n"
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ "Portions Copyright(c) 1994 - 7 Regents of the University of California\n\n"
"Permission to use, copy, modify, and distribute this software and its\n"
"documentation for any purpose, without fee, and without a written agreement\n"
"is hereby granted, provided that the above copyright notice and this paragraph\n"
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 6ce7266385..b0dc10c0ca 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -572,7 +572,8 @@ showVersion(void)
#endif
puts("Copyright (C) 2000 PostgreSQL Global Development Team");
- puts("Copyright (C) 1996 Regents of the University of California");
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ puts("Portions Copyright (C) 1996 Regents of the University of California");
puts("Read the file COPYING or use the command \\copyright to see the");
puts("usage and distribution terms.");
}
diff --git a/src/include/access/attnum.h b/src/include/access/attnum.h
index 6349eac761..8f6cc09e66 100644
--- a/src/include/access/attnum.h
+++ b/src/include/access/attnum.h
@@ -4,7 +4,8 @@
* POSTGRES attribute number definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/funcindex.h b/src/include/access/funcindex.h
index 0ad0f05432..4933caa791 100644
--- a/src/include/access/funcindex.h
+++ b/src/include/access/funcindex.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index 27d5f0b1cc..a13274e5a4 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -4,7 +4,8 @@
* POSTGRES general access method definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index 253e98d62d..4d682366c3 100644
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -4,7 +4,8 @@
* header file for postgres hash access method implementation
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 5036d5f142..ec102a4d03 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -4,7 +4,8 @@
* POSTGRES heap access method definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/hio.h b/src/include/access/hio.h
index 9d6b27db00..ded9092f57 100644
--- a/src/include/access/hio.h
+++ b/src/include/access/hio.h
@@ -4,7 +4,8 @@
* POSTGRES heap access method input/output definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/htup.h b/src/include/access/htup.h
index 473c366b86..1af1763244 100644
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -4,7 +4,8 @@
* POSTGRES heap tuple definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/ibit.h b/src/include/access/ibit.h
index d64b960174..5ce05423dd 100644
--- a/src/include/access/ibit.h
+++ b/src/include/access/ibit.h
@@ -4,7 +4,8 @@
* POSTGRES index valid attribute bit map definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/iqual.h b/src/include/access/iqual.h
index d05a124240..51e06b361b 100644
--- a/src/include/access/iqual.h
+++ b/src/include/access/iqual.h
@@ -4,7 +4,8 @@
* Index scan key qualification definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h
index 2e2293f9c3..b332e28347 100644
--- a/src/include/access/istrat.h
+++ b/src/include/access/istrat.h
@@ -4,7 +4,8 @@
* POSTGRES index strategy definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/itup.h b/src/include/access/itup.h
index d2dba7fa9c..04c9e683d9 100644
--- a/src/include/access/itup.h
+++ b/src/include/access/itup.h
@@ -4,7 +4,8 @@
* POSTGRES index tuple definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index d7edbe80b3..900f3239ef 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -4,7 +4,8 @@
* header file for postgres btree access method implementation.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/printtup.h b/src/include/access/printtup.h
index 64299c1e6f..7f0efbe906 100644
--- a/src/include/access/printtup.h
+++ b/src/include/access/printtup.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h
index 5c080c66e7..72cecd4a5a 100644
--- a/src/include/access/relscan.h
+++ b/src/include/access/relscan.h
@@ -4,7 +4,8 @@
* POSTGRES internal relation scan descriptor definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h
index 1ab5a394c0..b1e02c5cbd 100644
--- a/src/include/access/rtree.h
+++ b/src/include/access/rtree.h
@@ -4,7 +4,8 @@
* common declarations for the rtree access method code.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/rtscan.h b/src/include/access/rtscan.h
index 8bbed0cd85..d7d38389fd 100644
--- a/src/include/access/rtscan.h
+++ b/src/include/access/rtscan.h
@@ -4,7 +4,8 @@
* routines defined in access/rtree/rtscan.c
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/rtstrat.h b/src/include/access/rtstrat.h
index e659f2aa3d..1bdee8f96f 100644
--- a/src/include/access/rtstrat.h
+++ b/src/include/access/rtstrat.h
@@ -4,7 +4,8 @@
* routines defined in access/rtree/rtstrat.c
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/sdir.h b/src/include/access/sdir.h
index a7275411d7..69c40173a6 100644
--- a/src/include/access/sdir.h
+++ b/src/include/access/sdir.h
@@ -4,7 +4,8 @@
* POSTGRES scan direction definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/skey.h b/src/include/access/skey.h
index 6121ae29d4..012cebd5cd 100644
--- a/src/include/access/skey.h
+++ b/src/include/access/skey.h
@@ -4,7 +4,8 @@
* POSTGRES scan key definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/strat.h b/src/include/access/strat.h
index 3965640cbd..9f2994d29e 100644
--- a/src/include/access/strat.h
+++ b/src/include/access/strat.h
@@ -5,7 +5,8 @@
* (separated out from original istrat.h to avoid circular refs)
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/transam.h b/src/include/access/transam.h
index 53d362f386..cb409f2542 100644
--- a/src/include/access/transam.h
+++ b/src/include/access/transam.h
@@ -4,7 +4,8 @@
* postgres transaction access method support code header
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h
index 864ff9f20e..761dd17262 100644
--- a/src/include/access/tupdesc.h
+++ b/src/include/access/tupdesc.h
@@ -4,7 +4,8 @@
* POSTGRES tuple descriptor definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h
index 9199426c71..59c504c881 100644
--- a/src/include/access/tupmacs.h
+++ b/src/include/access/tupmacs.h
@@ -4,7 +4,8 @@
* Tuple macros used by both index tuples and heap tuples.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/valid.h b/src/include/access/valid.h
index c3509f6673..bc13be8971 100644
--- a/src/include/access/valid.h
+++ b/src/include/access/valid.h
@@ -4,7 +4,8 @@
* POSTGRES tuple qualification validity definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index e59cc9e98d..9c1263ab07 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -4,7 +4,8 @@
* postgres transaction system header
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h
index d5ae0d42f7..2f347ef9bb 100644
--- a/src/include/bootstrap/bootstrap.h
+++ b/src/include/bootstrap/bootstrap.h
@@ -4,7 +4,8 @@
* include file for the bootstrapping code
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/c.h b/src/include/c.h
index c6b783119e..d731f3d5f5 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -5,7 +5,8 @@
* postgres.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h
index f2c089e6fd..f96de025de 100644
--- a/src/include/catalog/catalog.h
+++ b/src/include/catalog/catalog.h
@@ -4,7 +4,8 @@
* prototypes for functions in lib/catalog/catalog.c
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/catname.h b/src/include/catalog/catname.h
index 265d3354ce..0ee3a083e6 100644
--- a/src/include/catalog/catname.h
+++ b/src/include/catalog/catname.h
@@ -4,7 +4,8 @@
* POSTGRES system catalog relation name definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 16fcaa40fc..32b5f086b5 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -34,7 +34,8 @@
* database contents or layout, such as altering tuple headers.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h
index 198715e166..32f46d7c29 100644
--- a/src/include/catalog/heap.h
+++ b/src/include/catalog/heap.h
@@ -4,7 +4,8 @@
* prototypes for functions in lib/catalog/heap.c
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h
index 148151d789..c81c89689f 100644
--- a/src/include/catalog/index.h
+++ b/src/include/catalog/index.h
@@ -4,7 +4,8 @@
* prototypes for index.c.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h
index f02de08edd..5a5167857c 100644
--- a/src/include/catalog/indexing.h
+++ b/src/include/catalog/indexing.h
@@ -5,7 +5,8 @@
* on system catalogs
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h
index ebb89713e6..fbd5371df9 100644
--- a/src/include/catalog/pg_aggregate.h
+++ b/src/include/catalog/pg_aggregate.h
@@ -5,7 +5,8 @@
* along with the relation's initial contents.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_am.h b/src/include/catalog/pg_am.h
index 6b3a1eaef3..4478ef3218 100644
--- a/src/include/catalog/pg_am.h
+++ b/src/include/catalog/pg_am.h
@@ -5,7 +5,8 @@
* along with the relation's initial contents.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h
index f25d044501..679a2e8094 100644
--- a/src/include/catalog/pg_amop.h
+++ b/src/include/catalog/pg_amop.h
@@ -5,7 +5,8 @@
* along with the relation's initial contents.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h
index d00990a722..4a8ef8c687 100644
--- a/src/include/catalog/pg_amproc.h
+++ b/src/include/catalog/pg_amproc.h
@@ -7,7 +7,8 @@
* methods that aren't associated with operators.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_attrdef.h b/src/include/catalog/pg_attrdef.h
index 3705b26862..6f84bdb30f 100644
--- a/src/include/catalog/pg_attrdef.h
+++ b/src/include/catalog/pg_attrdef.h
@@ -3,7 +3,8 @@
* pg_attrdef.h
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* NOTES
* the genbki.sh script reads this file and generates .bki
diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h
index 0861fd135d..67fa6423db 100644
--- a/src/include/catalog/pg_attribute.h
+++ b/src/include/catalog/pg_attribute.h
@@ -5,7 +5,8 @@
* along with the relation's initial contents.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h
index ec936cc43d..47a2272322 100644
--- a/src/include/catalog/pg_class.h
+++ b/src/include/catalog/pg_class.h
@@ -5,7 +5,8 @@
* along with the relation's initial contents.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_database.h b/src/include/catalog/pg_database.h
index ca21eeb9c3..eda79f6cfb 100644
--- a/src/include/catalog/pg_database.h
+++ b/src/include/catalog/pg_database.h
@@ -5,7 +5,8 @@
* along with the relation's initial contents.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_description.h b/src/include/catalog/pg_description.h
index e000aaa39b..9b97d2de0c 100644
--- a/src/include/catalog/pg_description.h
+++ b/src/include/catalog/pg_description.h
@@ -4,7 +4,8 @@
* definition of the system "description" relation (pg_description)
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_group.h b/src/include/catalog/pg_group.h
index fbfa7e1999..9a7ab2309c 100644
--- a/src/include/catalog/pg_group.h
+++ b/src/include/catalog/pg_group.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h
index f9192e755c..cf3b81039b 100644
--- a/src/include/catalog/pg_index.h
+++ b/src/include/catalog/pg_index.h
@@ -5,7 +5,8 @@
* along with the relation's initial contents.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_inheritproc.h b/src/include/catalog/pg_inheritproc.h
index 348f3241b9..e7185a0ad7 100644
--- a/src/include/catalog/pg_inheritproc.h
+++ b/src/include/catalog/pg_inheritproc.h
@@ -5,7 +5,8 @@
* along with the relation's initial contents.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_inherits.h b/src/include/catalog/pg_inherits.h
index 30b3b04944..137d8940cb 100644
--- a/src/include/catalog/pg_inherits.h
+++ b/src/include/catalog/pg_inherits.h
@@ -5,7 +5,8 @@
* along with the relation's initial contents.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_ipl.h b/src/include/catalog/pg_ipl.h
index 43a4ff2df0..bd92489ad5 100644
--- a/src/include/catalog/pg_ipl.h
+++ b/src/include/catalog/pg_ipl.h
@@ -5,7 +5,8 @@
* along with the relation's initial contents.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_language.h b/src/include/catalog/pg_language.h
index 125f759cfd..f886fd9db5 100644
--- a/src/include/catalog/pg_language.h
+++ b/src/include/catalog/pg_language.h
@@ -5,7 +5,8 @@
* along with the relation's initial contents.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_listener.h b/src/include/catalog/pg_listener.h
index 8ee3ed73d0..b9e8536118 100644
--- a/src/include/catalog/pg_listener.h
+++ b/src/include/catalog/pg_listener.h
@@ -4,7 +4,8 @@
* Asynchronous notification
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_log.h b/src/include/catalog/pg_log.h
index 42891e06e9..b0a47ee228 100644
--- a/src/include/catalog/pg_log.h
+++ b/src/include/catalog/pg_log.h
@@ -7,7 +7,8 @@
* relcache code happy.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h
index 25f796793f..0f1db7293a 100644
--- a/src/include/catalog/pg_opclass.h
+++ b/src/include/catalog/pg_opclass.h
@@ -5,7 +5,8 @@
* along with the relation's initial contents.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index 726fe5a648..b97acc0d54 100644
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
@@ -5,7 +5,8 @@
* along with the relation's initial contents.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index fd9d7e6c60..345d63364b 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -4,7 +4,8 @@
* definition of the system "procedure" relation (pg_proc)
* along with the relation's initial contents.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_relcheck.h b/src/include/catalog/pg_relcheck.h
index 0c0c259156..43dcbe8f3f 100644
--- a/src/include/catalog/pg_relcheck.h
+++ b/src/include/catalog/pg_relcheck.h
@@ -3,7 +3,8 @@
* pg_relcheck.h
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* NOTES
* the genbki.sh script reads this file and generates .bki
diff --git a/src/include/catalog/pg_rewrite.h b/src/include/catalog/pg_rewrite.h
index c2b6147872..4f9e4acfb2 100644
--- a/src/include/catalog/pg_rewrite.h
+++ b/src/include/catalog/pg_rewrite.h
@@ -5,7 +5,8 @@
* along with the relation's initial contents.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_shadow.h b/src/include/catalog/pg_shadow.h
index 0f31e1e6b7..e64c17c840 100644
--- a/src/include/catalog/pg_shadow.h
+++ b/src/include/catalog/pg_shadow.h
@@ -6,7 +6,8 @@
* pg_user is now a public accessible view on pg_shadow.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_statistic.h b/src/include/catalog/pg_statistic.h
index 8356a65f9f..ba6b6ae939 100644
--- a/src/include/catalog/pg_statistic.h
+++ b/src/include/catalog/pg_statistic.h
@@ -5,7 +5,8 @@
* along with the relation's initial contents.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_trigger.h b/src/include/catalog/pg_trigger.h
index 702cb9f238..76e28d2df1 100644
--- a/src/include/catalog/pg_trigger.h
+++ b/src/include/catalog/pg_trigger.h
@@ -3,7 +3,8 @@
* pg_trigger.h
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* NOTES
* the genbki.sh script reads this file and generates .bki
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index c702718b30..366e2b8935 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -5,7 +5,8 @@
* along with the relation's initial contents.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_variable.h b/src/include/catalog/pg_variable.h
index 819b9818ec..44dc7aa18c 100644
--- a/src/include/catalog/pg_variable.h
+++ b/src/include/catalog/pg_variable.h
@@ -7,7 +7,8 @@
* relcache code happy.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/catalog/pg_version.h b/src/include/catalog/pg_version.h
index 0ea22821be..1fe949c4d5 100644
--- a/src/include/catalog/pg_version.h
+++ b/src/include/catalog/pg_version.h
@@ -12,7 +12,8 @@
* isn't even created at present.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/commands/async.h b/src/include/commands/async.h
index 8c04e5f72d..a484eb4069 100644
--- a/src/include/commands/async.h
+++ b/src/include/commands/async.h
@@ -3,7 +3,8 @@
* async.h
* Asynchronous notification: NOTIFY, LISTEN, UNLISTEN
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/commands/cluster.h b/src/include/commands/cluster.h
index 73f1e1cf31..68b5d4ecc9 100644
--- a/src/include/commands/cluster.h
+++ b/src/include/commands/cluster.h
@@ -3,7 +3,8 @@
* cluster.h
* header file for postgres cluster command stuff
*
- * Copyright (c) 1994-5, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994-5, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/commands/command.h b/src/include/commands/command.h
index fdc7f6238d..7854dc9260 100644
--- a/src/include/commands/command.h
+++ b/src/include/commands/command.h
@@ -4,7 +4,8 @@
* prototypes for command.c.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/commands/copy.h b/src/include/commands/copy.h
index f5e34f37d2..43f8cb8a40 100644
--- a/src/include/commands/copy.h
+++ b/src/include/commands/copy.h
@@ -4,7 +4,8 @@
* Definitions for using the POSTGRES copy command.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/commands/creatinh.h b/src/include/commands/creatinh.h
index bfff23b01b..70e8994c30 100644
--- a/src/include/commands/creatinh.h
+++ b/src/include/commands/creatinh.h
@@ -4,7 +4,8 @@
* prototypes for creatinh.c.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h
index 61eed6718d..1eff7764c9 100644
--- a/src/include/commands/dbcommands.h
+++ b/src/include/commands/dbcommands.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h
index 000e876565..8ccc966c3b 100644
--- a/src/include/commands/defrem.h
+++ b/src/include/commands/defrem.h
@@ -4,7 +4,8 @@
* POSTGRES define and remove utility definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h
index 35dd5d63cf..00a3f31112 100644
--- a/src/include/commands/explain.h
+++ b/src/include/commands/explain.h
@@ -3,7 +3,8 @@
* explain.h
* prototypes for explain.c
*
- * Copyright (c) 1994-5, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994-5, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/commands/rename.h b/src/include/commands/rename.h
index b016eef061..2edfef5ba0 100644
--- a/src/include/commands/rename.h
+++ b/src/include/commands/rename.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h
index ac99ed596b..a9ada183a4 100644
--- a/src/include/commands/vacuum.h
+++ b/src/include/commands/vacuum.h
@@ -4,7 +4,8 @@
* header file for postgres vacuum cleaner
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/commands/version.h b/src/include/commands/version.h
index 55b2d97e52..061d1cd12d 100644
--- a/src/include/commands/version.h
+++ b/src/include/commands/version.h
@@ -4,7 +4,8 @@
* Header file for versions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/commands/view.h b/src/include/commands/view.h
index 82bfc1cc99..f99a4151f2 100644
--- a/src/include/commands/view.h
+++ b/src/include/commands/view.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/execFlatten.h b/src/include/executor/execFlatten.h
index c84c039acf..15d286da1a 100644
--- a/src/include/executor/execFlatten.h
+++ b/src/include/executor/execFlatten.h
@@ -4,7 +4,8 @@
* prototypes for execFlatten.c.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h
index 03a46d99d2..464b9a49c8 100644
--- a/src/include/executor/execdebug.h
+++ b/src/include/executor/execdebug.h
@@ -4,7 +4,8 @@
* #defines governing debugging behaviour in the executor
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/execdefs.h b/src/include/executor/execdefs.h
index ae2dfa836b..d484dab16a 100644
--- a/src/include/executor/execdefs.h
+++ b/src/include/executor/execdefs.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h
index 4b70c628eb..32b0f43e6d 100644
--- a/src/include/executor/execdesc.h
+++ b/src/include/executor/execdesc.h
@@ -5,7 +5,8 @@
* and related modules.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index 1091880ed7..5e823c3dea 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -4,7 +4,8 @@
* support for the POSTGRES executor module
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h
index 5d6615b84d..f6d7c52b41 100644
--- a/src/include/executor/functions.h
+++ b/src/include/executor/functions.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h
index 414711c2e0..4e3007e4df 100644
--- a/src/include/executor/hashjoin.h
+++ b/src/include/executor/hashjoin.h
@@ -4,7 +4,8 @@
* internal structures for hash joins
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h
index 4661e6111c..8d7f541b62 100644
--- a/src/include/executor/nodeAgg.h
+++ b/src/include/executor/nodeAgg.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h
index ad3d6fa4b0..f2d3db5708 100644
--- a/src/include/executor/nodeAppend.h
+++ b/src/include/executor/nodeAppend.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h
index b1af1943f8..9c3a53bf55 100644
--- a/src/include/executor/nodeGroup.h
+++ b/src/include/executor/nodeGroup.h
@@ -4,7 +4,8 @@
* prototypes for nodeGroup.c
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h
index 154c049ff4..c8ab96c431 100644
--- a/src/include/executor/nodeHash.h
+++ b/src/include/executor/nodeHash.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h
index 6117b96111..6f36bf26a5 100644
--- a/src/include/executor/nodeHashjoin.h
+++ b/src/include/executor/nodeHashjoin.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h
index a75b48fd83..113c6061f2 100644
--- a/src/include/executor/nodeIndexscan.h
+++ b/src/include/executor/nodeIndexscan.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h
index de32dd77b8..99987acb60 100644
--- a/src/include/executor/nodeMaterial.h
+++ b/src/include/executor/nodeMaterial.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h
index 97bd143e22..b6764e2948 100644
--- a/src/include/executor/nodeMergejoin.h
+++ b/src/include/executor/nodeMergejoin.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h
index c60ae03e98..664c88d05d 100644
--- a/src/include/executor/nodeNestloop.h
+++ b/src/include/executor/nodeNestloop.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h
index 3726dff34e..7987537b68 100644
--- a/src/include/executor/nodeResult.h
+++ b/src/include/executor/nodeResult.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h
index d504109b73..ed33936b81 100644
--- a/src/include/executor/nodeSeqscan.h
+++ b/src/include/executor/nodeSeqscan.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/nodeSort.h b/src/include/executor/nodeSort.h
index 8b1c012e36..fccdaa7ac0 100644
--- a/src/include/executor/nodeSort.h
+++ b/src/include/executor/nodeSort.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/nodeTidscan.h b/src/include/executor/nodeTidscan.h
index 885c5dafb6..2366a8a00c 100644
--- a/src/include/executor/nodeTidscan.h
+++ b/src/include/executor/nodeTidscan.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h
index 9afcd9007c..82f98a0eb2 100644
--- a/src/include/executor/nodeUnique.h
+++ b/src/include/executor/nodeUnique.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index 01a5d641be..a5536470b4 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -4,7 +4,8 @@
* tuple table support stuff
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/lib/dllist.h b/src/include/lib/dllist.h
index 18cb4d3861..5c41c6f07e 100644
--- a/src/include/lib/dllist.h
+++ b/src/include/lib/dllist.h
@@ -24,7 +24,8 @@
* DLFreeElem(elt); -- free the element since we don't
* use it anymore
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/lib/fstack.h b/src/include/lib/fstack.h
index fd10586e43..2c2b3a0625 100644
--- a/src/include/lib/fstack.h
+++ b/src/include/lib/fstack.h
@@ -4,7 +4,8 @@
* Fixed format stack definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/lib/hasht.h b/src/include/lib/hasht.h
index 3bf5b20b36..ff106eef80 100644
--- a/src/include/lib/hasht.h
+++ b/src/include/lib/hasht.h
@@ -5,7 +5,8 @@
* under utils/hash.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/lib/lispsort.h b/src/include/lib/lispsort.h
index 1838ca4514..d6a3a3d050 100644
--- a/src/include/lib/lispsort.h
+++ b/src/include/lib/lispsort.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h
index 6dc4a15547..5a7ea8dd0f 100644
--- a/src/include/lib/stringinfo.h
+++ b/src/include/lib/stringinfo.h
@@ -7,7 +7,8 @@
* It can be used to buffer either ordinary C strings (null-terminated text)
* or arbitrary binary data. All storage is allocated with palloc().
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h
index f3ae39fcc0..2ae40ca261 100644
--- a/src/include/libpq/auth.h
+++ b/src/include/libpq/auth.h
@@ -4,7 +4,8 @@
* Definitions for network authentication routines
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/libpq/be-fsstubs.h b/src/include/libpq/be-fsstubs.h
index 7744d92925..29d198a1ad 100644
--- a/src/include/libpq/be-fsstubs.h
+++ b/src/include/libpq/be-fsstubs.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h
index 6d68c0e91a..b4bf910677 100644
--- a/src/include/libpq/libpq-be.h
+++ b/src/include/libpq/libpq-be.h
@@ -5,7 +5,8 @@
* externs for functions used by the POSTGRES backend.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/libpq/libpq-fs.h b/src/include/libpq/libpq-fs.h
index 7e67ebd741..92621905c9 100644
--- a/src/include/libpq/libpq-fs.h
+++ b/src/include/libpq/libpq-fs.h
@@ -4,7 +4,8 @@
* definitions for using Inversion file system routines
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h
index cf3072cf9c..dccfbcebbb 100644
--- a/src/include/libpq/libpq.h
+++ b/src/include/libpq/libpq.h
@@ -4,7 +4,8 @@
* POSTGRES LIBPQ buffer structure definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index b701d90721..12dc6bde14 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -6,7 +6,8 @@
* NOTE: for historical reasons, this does not correspond to pqcomm.c.
* pqcomm.c's routines are declared in libpq.h.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/libpq/pqformat.h b/src/include/libpq/pqformat.h
index e373f5d49d..ed7e15047e 100644
--- a/src/include/libpq/pqformat.h
+++ b/src/include/libpq/pqformat.h
@@ -3,7 +3,8 @@
* pqformat.h
* Definitions for formatting and parsing frontend/backend messages
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/libpq/pqsignal.h b/src/include/libpq/pqsignal.h
index e25bd83d9e..5e6b1dc0f1 100644
--- a/src/include/libpq/pqsignal.h
+++ b/src/include/libpq/pqsignal.h
@@ -4,7 +4,8 @@
* prototypes for the reliable BSD-style signal(2) routine.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 8795ce080b..5ea27c5df7 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -9,7 +9,8 @@
* pmod.h processing modes
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 774d94cb07..d1725ea313 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -4,7 +4,8 @@
* definitions for executor state nodes
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h
index cb6c2a395b..4449856da2 100644
--- a/src/include/nodes/makefuncs.h
+++ b/src/include/nodes/makefuncs.h
@@ -4,7 +4,8 @@
* prototypes for the creator functions (for primitive nodes)
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/nodes/memnodes.h b/src/include/nodes/memnodes.h
index ec3cc82a3d..163598afd4 100644
--- a/src/include/nodes/memnodes.h
+++ b/src/include/nodes/memnodes.h
@@ -4,7 +4,8 @@
* POSTGRES memory context node definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h
index c4a9657459..33756e77f6 100644
--- a/src/include/nodes/nodeFuncs.h
+++ b/src/include/nodes/nodeFuncs.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 2fc484c137..9401cad8ba 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -4,7 +4,8 @@
* Definitions for tagged nodes.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h
index ff8046487c..1d1cbee514 100644
--- a/src/include/nodes/params.h
+++ b/src/include/nodes/params.h
@@ -4,7 +4,8 @@
* Declarations/definitions of stuff needed to handle parameterized plans.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index b4b1613bbb..065a0d18af 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -4,7 +4,8 @@
* definitions for parse tree nodes
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h
index c75555fde0..5592307e9d 100644
--- a/src/include/nodes/pg_list.h
+++ b/src/include/nodes/pg_list.h
@@ -4,7 +4,8 @@
* POSTGRES generic list package
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index 759f133d7d..a16d42cbfb 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -4,7 +4,8 @@
* definitions for query plan nodes
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index 4cf441c756..325731ac25 100644
--- a/src/include/nodes/primnodes.h
+++ b/src/include/nodes/primnodes.h
@@ -4,7 +4,8 @@
* Definitions for parse tree/query tree ("primitive") nodes.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h
index d4b0aa056a..113b7aae51 100644
--- a/src/include/nodes/print.h
+++ b/src/include/nodes/print.h
@@ -4,7 +4,8 @@
* definitions for executor state nodes
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/nodes/readfuncs.h b/src/include/nodes/readfuncs.h
index ab07c6b066..e093b1e2d9 100644
--- a/src/include/nodes/readfuncs.h
+++ b/src/include/nodes/readfuncs.h
@@ -4,7 +4,8 @@
* header file for read.c and readfuncs.c. These functions are internal
* to the stringToNode interface and should not be used by anyone else.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index 03d310c446..d5c129bdeb 100644
--- a/src/include/nodes/relation.h
+++ b/src/include/nodes/relation.h
@@ -4,7 +4,8 @@
* Definitions for internal planner nodes.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/_deadcode/xfunc.h b/src/include/optimizer/_deadcode/xfunc.h
index fde3e0ca0c..01de6eab61 100644
--- a/src/include/optimizer/_deadcode/xfunc.h
+++ b/src/include/optimizer/_deadcode/xfunc.h
@@ -4,7 +4,8 @@
* prototypes for xfunc.c and predmig.c.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h
index d04db652c9..2a60a7e9bf 100644
--- a/src/include/optimizer/clauses.h
+++ b/src/include/optimizer/clauses.h
@@ -4,7 +4,8 @@
* prototypes for clauses.c.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index f2eb2aa8ea..62b0bca945 100644
--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -4,7 +4,8 @@
* prototypes for costsize.c and clausesel.c.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h
index 126149f08b..6524875d1d 100644
--- a/src/include/optimizer/geqo.h
+++ b/src/include/optimizer/geqo.h
@@ -3,7 +3,8 @@
* geqo.h
* prototypes for various files in optimizer/geqo
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/geqo_copy.h b/src/include/optimizer/geqo_copy.h
index eb8a0dd997..e14c7f2896 100644
--- a/src/include/optimizer/geqo_copy.h
+++ b/src/include/optimizer/geqo_copy.h
@@ -3,7 +3,8 @@
* geqo_copy.h
* prototypes for copy functions in optimizer/geqo
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/geqo_gene.h b/src/include/optimizer/geqo_gene.h
index ae83712599..e1da0dec76 100644
--- a/src/include/optimizer/geqo_gene.h
+++ b/src/include/optimizer/geqo_gene.h
@@ -3,7 +3,8 @@
* geqo_gene.h
* genome representation in optimizer/geqo
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h
index b300a94c40..30bab67882 100644
--- a/src/include/optimizer/geqo_misc.h
+++ b/src/include/optimizer/geqo_misc.h
@@ -3,7 +3,8 @@
* geqo_misc.h
* prototypes for printout routines in optimizer/geqo
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/geqo_mutation.h b/src/include/optimizer/geqo_mutation.h
index dd445a8a9c..8301eeb131 100644
--- a/src/include/optimizer/geqo_mutation.h
+++ b/src/include/optimizer/geqo_mutation.h
@@ -3,7 +3,8 @@
* geqo_mutation.h
* prototypes for mutation functions in optimizer/geqo
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/geqo_pool.h b/src/include/optimizer/geqo_pool.h
index 67bd5557c3..d08007f6ed 100644
--- a/src/include/optimizer/geqo_pool.h
+++ b/src/include/optimizer/geqo_pool.h
@@ -3,7 +3,8 @@
* geqo_pool.h
* pool representation in optimizer/geqo
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/geqo_random.h b/src/include/optimizer/geqo_random.h
index b5d28e400b..6dad9efbf8 100644
--- a/src/include/optimizer/geqo_random.h
+++ b/src/include/optimizer/geqo_random.h
@@ -3,7 +3,8 @@
* geqo_random.h
* random number generator
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/geqo_recombination.h b/src/include/optimizer/geqo_recombination.h
index b4a200d54c..58ffafff9b 100644
--- a/src/include/optimizer/geqo_recombination.h
+++ b/src/include/optimizer/geqo_recombination.h
@@ -3,7 +3,8 @@
* geqo_recombination.h
* prototypes for recombination in the genetic query optimizer
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/geqo_selection.h b/src/include/optimizer/geqo_selection.h
index dfe5861684..123f53c71c 100644
--- a/src/include/optimizer/geqo_selection.h
+++ b/src/include/optimizer/geqo_selection.h
@@ -3,7 +3,8 @@
* geqo_selection.h
* prototypes for selection routines in optimizer/geqo
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/internal.h b/src/include/optimizer/internal.h
index b6b958b4b7..f46bea18da 100644
--- a/src/include/optimizer/internal.h
+++ b/src/include/optimizer/internal.h
@@ -4,7 +4,8 @@
* Definitions required throughout the query optimizer.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h
index 309f4d034a..422f205afb 100644
--- a/src/include/optimizer/joininfo.h
+++ b/src/include/optimizer/joininfo.h
@@ -4,7 +4,8 @@
* prototypes for joininfo.c.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h
index 19dffe8099..984148bb1b 100644
--- a/src/include/optimizer/pathnode.h
+++ b/src/include/optimizer/pathnode.h
@@ -4,7 +4,8 @@
* prototypes for pathnode.c, indexnode.c, relnode.c.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
index e884df35c4..2326207e21 100644
--- a/src/include/optimizer/paths.h
+++ b/src/include/optimizer/paths.h
@@ -5,7 +5,8 @@
* header files)
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h
index 9fe2ddafcb..af42bef15b 100644
--- a/src/include/optimizer/plancat.h
+++ b/src/include/optimizer/plancat.h
@@ -4,7 +4,8 @@
* prototypes for plancat.c.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index 10ba407822..f2d8dd0670 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -4,7 +4,8 @@
* prototypes for various files in optimizer/plan
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h
index c54d57dd4d..d5f8577c36 100644
--- a/src/include/optimizer/planner.h
+++ b/src/include/optimizer/planner.h
@@ -4,7 +4,8 @@
* prototypes for planner.c.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h
index d5da18e297..9e1399f7bd 100644
--- a/src/include/optimizer/prep.h
+++ b/src/include/optimizer/prep.h
@@ -4,7 +4,8 @@
* prototypes for files in optimizer/prep/
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h
index e3444613e7..89480bfc6b 100644
--- a/src/include/optimizer/restrictinfo.h
+++ b/src/include/optimizer/restrictinfo.h
@@ -4,7 +4,8 @@
* prototypes for restrictinfo.c.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h
index a8feddb01f..6e8fad3aa8 100644
--- a/src/include/optimizer/tlist.h
+++ b/src/include/optimizer/tlist.h
@@ -4,7 +4,8 @@
* prototypes for tlist.c.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h
index c36ce979de..b153674292 100644
--- a/src/include/optimizer/var.h
+++ b/src/include/optimizer/var.h
@@ -4,7 +4,8 @@
* prototypes for var.c.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h
index b305950d20..ff230bfe8e 100644
--- a/src/include/parser/analyze.h
+++ b/src/include/parser/analyze.h
@@ -3,7 +3,8 @@
* analyze.h
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h
index d69efd6221..88a40e39c2 100644
--- a/src/include/parser/gramparse.h
+++ b/src/include/parser/gramparse.h
@@ -4,7 +4,8 @@
* scanner support routines. used by both the bootstrap lexer
* as well as the normal lexer
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/parser/keywords.h b/src/include/parser/keywords.h
index 75f13b1e98..8ea4665338 100644
--- a/src/include/parser/keywords.h
+++ b/src/include/parser/keywords.h
@@ -5,7 +5,8 @@
* in the bowels of the system. Look for actual defs in lib/C/atoms.c
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h
index 20a07afe6e..2ee66595c6 100644
--- a/src/include/parser/parse_agg.h
+++ b/src/include/parser/parse_agg.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/parser/parse_clause.h b/src/include/parser/parse_clause.h
index 659fdb0ef2..4e43fdee40 100644
--- a/src/include/parser/parse_clause.h
+++ b/src/include/parser/parse_clause.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h
index 7d606dc6b0..aafe0bbc5d 100644
--- a/src/include/parser/parse_coerce.h
+++ b/src/include/parser/parse_coerce.h
@@ -4,7 +4,8 @@
*
* Routines for type coercion.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h
index 85f76fd2ed..8d8a3ae28a 100644
--- a/src/include/parser/parse_expr.h
+++ b/src/include/parser/parse_expr.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h
index 2b934865f8..1da44a9550 100644
--- a/src/include/parser/parse_func.h
+++ b/src/include/parser/parse_func.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h
index b8c38e5ffb..29523df382 100644
--- a/src/include/parser/parse_node.h
+++ b/src/include/parser/parse_node.h
@@ -3,7 +3,8 @@
* parse_node.h
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h
index 470720b106..c2d4f7dc28 100644
--- a/src/include/parser/parse_oper.h
+++ b/src/include/parser/parse_oper.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h
index 65f9a83df3..16c715791b 100644
--- a/src/include/parser/parse_relation.h
+++ b/src/include/parser/parse_relation.h
@@ -4,7 +4,8 @@
* prototypes for parse_relation.c.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/parser/parse_target.h b/src/include/parser/parse_target.h
index 6003907f4a..8637e2c9b6 100644
--- a/src/include/parser/parse_target.h
+++ b/src/include/parser/parse_target.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/parser/parse_type.h b/src/include/parser/parse_type.h
index eb5e7ff2c9..6704357000 100644
--- a/src/include/parser/parse_type.h
+++ b/src/include/parser/parse_type.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/parser/parser.h b/src/include/parser/parser.h
index eb3286b984..ce7862da6a 100644
--- a/src/include/parser/parser.h
+++ b/src/include/parser/parser.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/parser/parsetree.h b/src/include/parser/parsetree.h
index e863aab896..5ab9028caf 100644
--- a/src/include/parser/parsetree.h
+++ b/src/include/parser/parsetree.h
@@ -5,7 +5,8 @@
* parse trees.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/parser/scansup.h b/src/include/parser/scansup.h
index ab6c42633c..6b36f9fabb 100644
--- a/src/include/parser/scansup.h
+++ b/src/include/parser/scansup.h
@@ -4,7 +4,8 @@
* scanner support routines. used by both the bootstrap lexer
* as well as the normal lexer
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/postgres.h b/src/include/postgres.h
index b5b159fcc4..37a7f8a49e 100644
--- a/src/include/postgres.h
+++ b/src/include/postgres.h
@@ -4,7 +4,8 @@
* definition of (and support for) postgres system types.
* this file is included by almost every .c in the system
*
- * Copyright (c) 1995, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1995, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/rewrite/locks.h b/src/include/rewrite/locks.h
index 8add8a6592..797cbaf071 100644
--- a/src/include/rewrite/locks.h
+++ b/src/include/rewrite/locks.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/rewrite/prs2lock.h b/src/include/rewrite/prs2lock.h
index 493082a181..39052ec17e 100644
--- a/src/include/rewrite/prs2lock.h
+++ b/src/include/rewrite/prs2lock.h
@@ -3,7 +3,8 @@
* prs2lock.h
* data structures for POSTGRES Rule System II (rewrite rules only)
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/rewrite/rewriteDefine.h b/src/include/rewrite/rewriteDefine.h
index dce8110779..dbee3032e1 100644
--- a/src/include/rewrite/rewriteDefine.h
+++ b/src/include/rewrite/rewriteDefine.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/rewrite/rewriteHandler.h b/src/include/rewrite/rewriteHandler.h
index 9182c71599..85b9f261f8 100644
--- a/src/include/rewrite/rewriteHandler.h
+++ b/src/include/rewrite/rewriteHandler.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h
index e833cb277f..2be5352290 100644
--- a/src/include/rewrite/rewriteManip.h
+++ b/src/include/rewrite/rewriteManip.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/rewrite/rewriteRemove.h b/src/include/rewrite/rewriteRemove.h
index 9f593d21d6..870ab851c0 100644
--- a/src/include/rewrite/rewriteRemove.h
+++ b/src/include/rewrite/rewriteRemove.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/rewrite/rewriteSupport.h b/src/include/rewrite/rewriteSupport.h
index 2864174780..a457951b98 100644
--- a/src/include/rewrite/rewriteSupport.h
+++ b/src/include/rewrite/rewriteSupport.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/rusagestub.h b/src/include/rusagestub.h
index 5b4e31f809..f0b6387d4a 100644
--- a/src/include/rusagestub.h
+++ b/src/include/rusagestub.h
@@ -4,7 +4,8 @@
* Stubs for getrusage(3).
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/backendid.h b/src/include/storage/backendid.h
index db8ab27e80..7040a349a3 100644
--- a/src/include/storage/backendid.h
+++ b/src/include/storage/backendid.h
@@ -4,7 +4,8 @@
* POSTGRES backend id communication definitions
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/block.h b/src/include/storage/block.h
index 1f2cf10f7e..2cd8a897ec 100644
--- a/src/include/storage/block.h
+++ b/src/include/storage/block.h
@@ -4,7 +4,8 @@
* POSTGRES disk block definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/buf.h b/src/include/storage/buf.h
index 67ebad711b..e1aa190ea6 100644
--- a/src/include/storage/buf.h
+++ b/src/include/storage/buf.h
@@ -4,7 +4,8 @@
* Basic buffer manager data types.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h
index 88fa5efeda..cb7cb5cfc9 100644
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.h
@@ -4,7 +4,8 @@
* Internal definitions for buffer manager.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/buffile.h b/src/include/storage/buffile.h
index 4ad17468d4..5deadfa10a 100644
--- a/src/include/storage/buffile.h
+++ b/src/include/storage/buffile.h
@@ -15,7 +15,8 @@
* but currently we have no need for oversize temp files without buffered
* access.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index 4d7762c116..3fced95137 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -4,7 +4,8 @@
* POSTGRES buffer manager definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h
index 854f0018f3..db3f0daca3 100644
--- a/src/include/storage/bufpage.h
+++ b/src/include/storage/bufpage.h
@@ -4,7 +4,8 @@
* Standard POSTGRES buffer page definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h
index 8037561344..b90b891676 100644
--- a/src/include/storage/fd.h
+++ b/src/include/storage/fd.h
@@ -4,7 +4,8 @@
* Virtual file descriptor definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h
index fa57de087b..427ff580e5 100644
--- a/src/include/storage/ipc.h
+++ b/src/include/storage/ipc.h
@@ -4,7 +4,8 @@
* POSTGRES inter-process communication definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/item.h b/src/include/storage/item.h
index bbefceb8fb..0f1f4f5633 100644
--- a/src/include/storage/item.h
+++ b/src/include/storage/item.h
@@ -4,7 +4,8 @@
* POSTGRES disk item definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/itemid.h b/src/include/storage/itemid.h
index d8c43183be..d7f602d681 100644
--- a/src/include/storage/itemid.h
+++ b/src/include/storage/itemid.h
@@ -4,7 +4,8 @@
* Standard POSTGRES buffer page item identifier definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/itempos.h b/src/include/storage/itempos.h
index b6379372fa..df86ba3292 100644
--- a/src/include/storage/itempos.h
+++ b/src/include/storage/itempos.h
@@ -4,7 +4,8 @@
* Standard POSTGRES buffer page long item subposition definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/itemptr.h b/src/include/storage/itemptr.h
index 483445fead..6c90a5626d 100644
--- a/src/include/storage/itemptr.h
+++ b/src/include/storage/itemptr.h
@@ -4,7 +4,8 @@
* POSTGRES disk item pointer definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/large_object.h b/src/include/storage/large_object.h
index 0d32468023..dbc6f9eeae 100644
--- a/src/include/storage/large_object.h
+++ b/src/include/storage/large_object.h
@@ -5,7 +5,8 @@
* zillions of large objects (internal, external, jaquith, inversion).
* Now we only support inversion.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h
index 09b3eac1af..451984a64e 100644
--- a/src/include/storage/lmgr.h
+++ b/src/include/storage/lmgr.h
@@ -4,7 +4,8 @@
* POSTGRES lock manager definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index 09b606eb67..163696ac18 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/multilev.h b/src/include/storage/multilev.h
index f1a628623e..a3c2713f6b 100644
--- a/src/include/storage/multilev.h
+++ b/src/include/storage/multilev.h
@@ -5,7 +5,8 @@
* clients
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/off.h b/src/include/storage/off.h
index 1938e983c5..ec7aa2a658 100644
--- a/src/include/storage/off.h
+++ b/src/include/storage/off.h
@@ -4,7 +4,8 @@
* POSTGRES disk "offset" definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/page.h b/src/include/storage/page.h
index 74aac783e9..60744cb931 100644
--- a/src/include/storage/page.h
+++ b/src/include/storage/page.h
@@ -4,7 +4,8 @@
* POSTGRES buffer page abstraction definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/pagenum.h b/src/include/storage/pagenum.h
index 9e25f7ba9d..d3a7026245 100644
--- a/src/include/storage/pagenum.h
+++ b/src/include/storage/pagenum.h
@@ -4,7 +4,8 @@
* POSTGRES page number definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/pos.h b/src/include/storage/pos.h
index 07b9d94413..3bfb032981 100644
--- a/src/include/storage/pos.h
+++ b/src/include/storage/pos.h
@@ -4,7 +4,8 @@
* POSTGRES "position" definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index b1522a8f11..1b25fab522 100644
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index 10e84f64f7..a4146c6350 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -3,7 +3,8 @@
* s_lock.h
* This file contains the implementation (if any) for spinlocks.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h
index 9a231a159e..85806973c5 100644
--- a/src/include/storage/shmem.h
+++ b/src/include/storage/shmem.h
@@ -4,7 +4,8 @@
* shared memory management structures
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h
index c56d6c1ce9..3934c29779 100644
--- a/src/include/storage/sinval.h
+++ b/src/include/storage/sinval.h
@@ -4,7 +4,8 @@
* POSTGRES shared cache invalidation communication definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h
index 51875edca9..11fcb92700 100644
--- a/src/include/storage/sinvaladt.h
+++ b/src/include/storage/sinvaladt.h
@@ -4,7 +4,8 @@
* POSTGRES shared cache invalidation segment definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h
index eee5c2327f..121b98462d 100644
--- a/src/include/storage/smgr.h
+++ b/src/include/storage/smgr.h
@@ -4,7 +4,8 @@
* storage manager switch public interface declarations.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/storage/spin.h b/src/include/storage/spin.h
index 69968f57d7..2c7f267a9f 100644
--- a/src/include/storage/spin.h
+++ b/src/include/storage/spin.h
@@ -4,7 +4,8 @@
* synchronization routines
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h
index 2e74d4bfd6..962decb108 100644
--- a/src/include/tcop/dest.h
+++ b/src/include/tcop/dest.h
@@ -42,7 +42,8 @@
* in-line in BeginCommand and EndCommand probably should be moved out
* to routines associated with each destination receiver type.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/tcop/fastpath.h b/src/include/tcop/fastpath.h
index 63f9cb15e8..033fb118a0 100644
--- a/src/include/tcop/fastpath.h
+++ b/src/include/tcop/fastpath.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/tcop/pquery.h b/src/include/tcop/pquery.h
index 9f20a83a17..c9d4f071e2 100644
--- a/src/include/tcop/pquery.h
+++ b/src/include/tcop/pquery.h
@@ -4,7 +4,8 @@
* prototypes for pquery.c.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/tcop/tcopdebug.h b/src/include/tcop/tcopdebug.h
index 1ff5616d0f..1b93842978 100644
--- a/src/include/tcop/tcopdebug.h
+++ b/src/include/tcop/tcopdebug.h
@@ -4,7 +4,8 @@
* #defines governing debugging behaviour in the traffic cop
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
index a5f02dd228..a10cc824b1 100644
--- a/src/include/tcop/tcopprot.h
+++ b/src/include/tcop/tcopprot.h
@@ -4,7 +4,8 @@
* prototypes for postgres.c.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/tcop/utility.h b/src/include/tcop/utility.h
index 78a39a7787..04de53ade3 100644
--- a/src/include/tcop/utility.h
+++ b/src/include/tcop/utility.h
@@ -4,7 +4,8 @@
* prototypes for utility.c.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index 37dd169bf6..38896fefda 100644
--- a/src/include/utils/acl.h
+++ b/src/include/utils/acl.h
@@ -4,7 +4,8 @@
* Definition of (and support for) access control list data structures.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index f0a2cc1cbb..45fc46dce0 100644
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -8,7 +8,8 @@
* utils/adt/chunk.c
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/bit.h b/src/include/utils/bit.h
index 77e3ab1396..f0144ba1cd 100644
--- a/src/include/utils/bit.h
+++ b/src/include/utils/bit.h
@@ -4,7 +4,8 @@
* Standard bit array definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 5df0c6748c..98d5dd62c7 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -4,7 +4,8 @@
* Declarations for operations on built-in types.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index d110f41022..a5a200b22c 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -4,7 +4,8 @@
* Low-level catalog cache definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h
index a5ee75d7c6..71145a0527 100644
--- a/src/include/utils/datetime.h
+++ b/src/include/utils/datetime.h
@@ -4,7 +4,8 @@
* Definitions for the datetime
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/datum.h b/src/include/utils/datum.h
index 3949785666..e8dcaab476 100644
--- a/src/include/utils/datum.h
+++ b/src/include/utils/datum.h
@@ -4,7 +4,8 @@
* POSTGRES abstract data type datum representation definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/dt.h b/src/include/utils/dt.h
index 78d6f7a6dc..d0618f98a8 100644
--- a/src/include/utils/dt.h
+++ b/src/include/utils/dt.h
@@ -6,7 +6,8 @@
* including abstime, reltime, date, and time.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/dynahash.h b/src/include/utils/dynahash.h
index 5d56c217a9..2d343c7f22 100644
--- a/src/include/utils/dynahash.h
+++ b/src/include/utils/dynahash.h
@@ -4,7 +4,8 @@
* POSTGRES dynahash.h file definitions
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/dynamic_loader.h b/src/include/utils/dynamic_loader.h
index 6fe932cba0..6f2c695ae5 100644
--- a/src/include/utils/dynamic_loader.h
+++ b/src/include/utils/dynamic_loader.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h
index 82a4145a5b..802461230b 100644
--- a/src/include/utils/elog.h
+++ b/src/include/utils/elog.h
@@ -4,7 +4,8 @@
* POSTGRES error logging definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/exc.h b/src/include/utils/exc.h
index 5c0d5c4453..a5d7c55991 100644
--- a/src/include/utils/exc.h
+++ b/src/include/utils/exc.h
@@ -4,7 +4,8 @@
* POSTGRES exception handling definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/excid.h b/src/include/utils/excid.h
index 05c3f1ceec..a48c9a79a3 100644
--- a/src/include/utils/excid.h
+++ b/src/include/utils/excid.h
@@ -4,7 +4,8 @@
* POSTGRES known exception identifier definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/fcache.h b/src/include/utils/fcache.h
index 78217ba903..f3d425d389 100644
--- a/src/include/utils/fcache.h
+++ b/src/include/utils/fcache.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/fcache2.h b/src/include/utils/fcache2.h
index 4d669a599b..9b78236367 100644
--- a/src/include/utils/fcache2.h
+++ b/src/include/utils/fcache2.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/fmgrtab.h b/src/include/utils/fmgrtab.h
index 36f86cc8c4..eff23f1e5f 100644
--- a/src/include/utils/fmgrtab.h
+++ b/src/include/utils/fmgrtab.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h
index 6e1a9887f1..977830d70a 100644
--- a/src/include/utils/geo_decls.h
+++ b/src/include/utils/geo_decls.h
@@ -3,7 +3,8 @@
* geo_decls.h - Declarations for various 2D constructs.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h
index 32ee297bfe..5a7967a5ef 100644
--- a/src/include/utils/hsearch.h
+++ b/src/include/utils/hsearch.h
@@ -4,7 +4,8 @@
* for hashing in the new buffer manager
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/inet.h b/src/include/utils/inet.h
index 56d9f3fd7d..37b624e947 100644
--- a/src/include/utils/inet.h
+++ b/src/include/utils/inet.h
@@ -4,7 +4,8 @@
* Declarations for operations on built-in types.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/int8.h b/src/include/utils/int8.h
index 23ef7d8b85..34c6785f60 100644
--- a/src/include/utils/int8.h
+++ b/src/include/utils/int8.h
@@ -4,7 +4,8 @@
* Declarations for operations on 64-bit integers.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h
index 4a28978ff0..1863f89458 100644
--- a/src/include/utils/inval.h
+++ b/src/include/utils/inval.h
@@ -4,7 +4,8 @@
* POSTGRES cache invalidation dispatcher definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/logtape.h b/src/include/utils/logtape.h
index 102adfa9fe..9ed64fa816 100644
--- a/src/include/utils/logtape.h
+++ b/src/include/utils/logtape.h
@@ -5,7 +5,8 @@
*
* See logtape.c for explanations.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index e2c7382e15..bff3d40454 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -3,7 +3,8 @@
* lsyscache.h
* Convenience routines for common queries in the system catalog cache.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/mcxt.h b/src/include/utils/mcxt.h
index 3fb70a079c..52edd2d93e 100644
--- a/src/include/utils/mcxt.h
+++ b/src/include/utils/mcxt.h
@@ -4,7 +4,8 @@
* POSTGRES memory context definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index 4253fb9348..1810329c75 100644
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -10,7 +10,8 @@
* oset.h (used by aset.h)
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/module.h b/src/include/utils/module.h
index 064cdd815d..90d9c3b7d4 100644
--- a/src/include/utils/module.h
+++ b/src/include/utils/module.h
@@ -8,7 +8,8 @@
* trace.h module trace stuff (now gone)
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h
index 38304b8a68..c276739d83 100644
--- a/src/include/utils/nabstime.h
+++ b/src/include/utils/nabstime.h
@@ -4,7 +4,8 @@
* Definitions for the "new" abstime code.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h
index c74d3fb236..bd0b0a014a 100644
--- a/src/include/utils/palloc.h
+++ b/src/include/utils/palloc.h
@@ -4,7 +4,8 @@
* POSTGRES memory allocator definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h
index 194440e0f8..8126361749 100644
--- a/src/include/utils/portal.h
+++ b/src/include/utils/portal.h
@@ -4,7 +4,8 @@
* POSTGRES portal definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index 888b3f28d3..841bd5d47f 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -4,7 +4,8 @@
* POSTGRES relation descriptor definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/rel2.h b/src/include/utils/rel2.h
index 3110ea305d..dc950ce42d 100644
--- a/src/include/utils/rel2.h
+++ b/src/include/utils/rel2.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h
index 6c031542d4..4b69a284ed 100644
--- a/src/include/utils/relcache.h
+++ b/src/include/utils/relcache.h
@@ -4,7 +4,8 @@
* Relation descriptor cache definitions.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/sets.h b/src/include/utils/sets.h
index 542810b773..30b1768868 100644
--- a/src/include/utils/sets.h
+++ b/src/include/utils/sets.h
@@ -4,7 +4,8 @@
*
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h
index 21fd005825..b4063c792c 100644
--- a/src/include/utils/syscache.h
+++ b/src/include/utils/syscache.h
@@ -6,7 +6,8 @@
* See also lsyscache.h, which provides convenience routines for
* common cache-lookup operations.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/temprel.h b/src/include/utils/temprel.h
index 477e2786fa..78c2ad2849 100644
--- a/src/include/utils/temprel.h
+++ b/src/include/utils/temprel.h
@@ -4,7 +4,8 @@
* Temporary relation functions
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h
index 37b92c451b..83bf649c65 100644
--- a/src/include/utils/tqual.h
+++ b/src/include/utils/tqual.h
@@ -5,7 +5,8 @@
*
* Should be moved/renamed... - vadim 07/28/98
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h
index adf8df478d..3c36257743 100644
--- a/src/include/utils/tuplesort.h
+++ b/src/include/utils/tuplesort.h
@@ -10,7 +10,8 @@
* amounts are sorted using temporary files and a standard external sort
* algorithm.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c
index 00c5810d25..f1ed700eec 100644
--- a/src/interfaces/ecpg/preproc/keywords.c
+++ b/src/interfaces/ecpg/preproc/keywords.c
@@ -3,7 +3,8 @@
* keywords.c
* lexical token lookup for reserved words in postgres SQL
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index 7b4e3020a6..35edbd0d21 100644
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -7,7 +7,8 @@
* This is a modified version of src/backend/parser/scan.l
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/interfaces/libpgtcl/libpgtcl.h b/src/interfaces/libpgtcl/libpgtcl.h
index 91afd4b86b..ccb44fd788 100644
--- a/src/interfaces/libpgtcl/libpgtcl.h
+++ b/src/interfaces/libpgtcl/libpgtcl.h
@@ -5,7 +5,8 @@
* libpgtcl is a tcl package for front-ends to interface with PostgreSQL.
* It's a Tcl wrapper for libpq.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/interfaces/libpgtcl/pgtcl.c b/src/interfaces/libpgtcl/pgtcl.c
index f6f2eca401..5bd420c230 100644
--- a/src/interfaces/libpgtcl/pgtcl.c
+++ b/src/interfaces/libpgtcl/pgtcl.c
@@ -5,7 +5,8 @@
* libpgtcl is a tcl package for front-ends to interface with PostgreSQL.
* It's a Tcl wrapper for libpq.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/interfaces/libpgtcl/pgtclCmds.c b/src/interfaces/libpgtcl/pgtclCmds.c
index 6e23776699..e404b5647d 100644
--- a/src/interfaces/libpgtcl/pgtclCmds.c
+++ b/src/interfaces/libpgtcl/pgtclCmds.c
@@ -3,7 +3,8 @@
* pgtclCmds.c
* C functions which implement pg_* tcl commands
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/interfaces/libpgtcl/pgtclCmds.h b/src/interfaces/libpgtcl/pgtclCmds.h
index cdaa89ca0e..5c25a63d3b 100644
--- a/src/interfaces/libpgtcl/pgtclCmds.h
+++ b/src/interfaces/libpgtcl/pgtclCmds.h
@@ -3,7 +3,8 @@
* pgtclCmds.h
* declarations for the C functions which implement pg_* tcl commands
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/interfaces/libpgtcl/pgtclId.c b/src/interfaces/libpgtcl/pgtclId.c
index a5e5bd4985..770255004e 100644
--- a/src/interfaces/libpgtcl/pgtclId.c
+++ b/src/interfaces/libpgtcl/pgtclId.c
@@ -9,7 +9,8 @@
*
* ASSUMPTION: sizeof(long) >= sizeof(void*)
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header$
diff --git a/src/interfaces/libpgtcl/pgtclId.h b/src/interfaces/libpgtcl/pgtclId.h
index 872b6d23e1..a2d026611d 100644
--- a/src/interfaces/libpgtcl/pgtclId.h
+++ b/src/interfaces/libpgtcl/pgtclId.h
@@ -7,7 +7,8 @@
* everything in Tcl is a string, but in C, pointers to data structures
* are needed.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/interfaces/libpq++/libpq++.h b/src/interfaces/libpq++/libpq++.h
index 22881ea1be..3a9035c44c 100644
--- a/src/interfaces/libpq++/libpq++.h
+++ b/src/interfaces/libpq++/libpq++.h
@@ -11,7 +11,8 @@
* NOTES
* Currently under construction.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
*-------------------------------------------------------------------------
diff --git a/src/interfaces/libpq++/pgconnection.h b/src/interfaces/libpq++/pgconnection.h
index 169eb1ba34..a3616c71b1 100644
--- a/src/interfaces/libpq++/pgconnection.h
+++ b/src/interfaces/libpq++/pgconnection.h
@@ -10,7 +10,8 @@
* NOTES
* Currently under construction.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/interfaces/libpq++/pgcursordb.h b/src/interfaces/libpq++/pgcursordb.h
index f685c8662b..991fd7ab52 100644
--- a/src/interfaces/libpq++/pgcursordb.h
+++ b/src/interfaces/libpq++/pgcursordb.h
@@ -10,7 +10,8 @@
* NOTES
* Currently under construction.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* $Id$
diff --git a/src/interfaces/libpq++/pgdatabase.h b/src/interfaces/libpq++/pgdatabase.h
index 912f585421..72796333da 100644
--- a/src/interfaces/libpq++/pgdatabase.h
+++ b/src/interfaces/libpq++/pgdatabase.h
@@ -10,7 +10,8 @@
* NOTES
* Currently under construction.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* $Id$
diff --git a/src/interfaces/libpq++/pglobject.h b/src/interfaces/libpq++/pglobject.h
index a1a25245ad..2ac3472da0 100644
--- a/src/interfaces/libpq++/pglobject.h
+++ b/src/interfaces/libpq++/pglobject.h
@@ -7,7 +7,8 @@
* declaration of the PGlobj class.
* PGlobj encapsulates a large object interface to Postgres backend
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* $Id$
diff --git a/src/interfaces/libpq++/pgtransdb.h b/src/interfaces/libpq++/pgtransdb.h
index 45b4d55089..ccf0ae78a3 100644
--- a/src/interfaces/libpq++/pgtransdb.h
+++ b/src/interfaces/libpq++/pgtransdb.h
@@ -10,7 +10,8 @@
* NOTES
* Currently under construction.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* $Id$
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index 438b9ab0c8..b5d3accf63 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -3,7 +3,8 @@
* fe-auth.c
* The front-end (client) authorization routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* NOTE: the error message strings returned by this module must not
* exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
diff --git a/src/interfaces/libpq/fe-auth.h b/src/interfaces/libpq/fe-auth.h
index 6367fb5338..297e2b1c29 100644
--- a/src/interfaces/libpq/fe-auth.h
+++ b/src/interfaces/libpq/fe-auth.h
@@ -4,7 +4,8 @@
*
* Definitions for network authentication routines
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index d89b07527a..c193898d5c 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -3,7 +3,8 @@
* fe-connect.c
* functions related to setting up a connection to the backend
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index 2b915cc35b..0d3f35a967 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -3,7 +3,8 @@
* fe-exec.c
* functions related to sending a query down to the backend
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 01e05e3a4b..16e20226fa 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -3,7 +3,8 @@
* fe-lobj.c
* Front-end large object interface
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
index 39a9ae27ad..191e536daa 100644
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -20,7 +20,8 @@
* for transmitted ints, whereas the backend modules (as of this writing)
* still handle either network or little-endian byte order.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c
index aff0b87791..a2bacde118 100644
--- a/src/interfaces/libpq/fe-print.c
+++ b/src/interfaces/libpq/fe-print.c
@@ -3,7 +3,8 @@
* fe-print.c
* functions for pretty-printing query results
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* These functions were formerly part of fe-exec.c, but they
* didn't really belong there.
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index 04180b8812..23ae036450 100644
--- a/src/interfaces/libpq/libpq-fe.h
+++ b/src/interfaces/libpq/libpq-fe.h
@@ -4,7 +4,8 @@
* This file contains definitions for structures and
* externs for functions used by frontend postgres applications.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index e3fd0b5386..27fb6637a0 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -9,7 +9,8 @@
* more likely to break across PostgreSQL releases than code that uses
* only the official API.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/interfaces/libpq/pqexpbuffer.c b/src/interfaces/libpq/pqexpbuffer.c
index 9d52cd4826..ec95c0c801 100644
--- a/src/interfaces/libpq/pqexpbuffer.c
+++ b/src/interfaces/libpq/pqexpbuffer.c
@@ -14,7 +14,8 @@
* a usable vsnprintf(), then a copy of our own implementation of it will
* be linked into libpq.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Header$
*
diff --git a/src/interfaces/libpq/pqexpbuffer.h b/src/interfaces/libpq/pqexpbuffer.h
index a259e01f97..772e5f10e4 100644
--- a/src/interfaces/libpq/pqexpbuffer.h
+++ b/src/interfaces/libpq/pqexpbuffer.h
@@ -15,7 +15,8 @@
* a usable vsnprintf(), then a copy of our own implementation of it will
* be linked into libpq.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/interfaces/libpq/pqsignal.c b/src/interfaces/libpq/pqsignal.c
index a786cec054..6754f1902e 100644
--- a/src/interfaces/libpq/pqsignal.c
+++ b/src/interfaces/libpq/pqsignal.c
@@ -4,7 +4,8 @@
* reliable BSD-style signal(2) routine stolen from RWW who stole it
* from Stevens...
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/interfaces/libpq/pqsignal.h b/src/interfaces/libpq/pqsignal.h
index 464b50f474..0c43349749 100644
--- a/src/interfaces/libpq/pqsignal.h
+++ b/src/interfaces/libpq/pqsignal.h
@@ -4,7 +4,8 @@
* prototypes for the reliable BSD-style signal(2) routine.
*
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* $Id$
*
diff --git a/src/test/examples/testlo.c b/src/test/examples/testlo.c
index 692dc365e2..ae6c04d764 100644
--- a/src/test/examples/testlo.c
+++ b/src/test/examples/testlo.c
@@ -3,7 +3,8 @@
* testlo.c
* test using large objects with libpq
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/test/examples/testlo2.c b/src/test/examples/testlo2.c
index 90d3c321c4..1ba8633852 100644
--- a/src/test/examples/testlo2.c
+++ b/src/test/examples/testlo2.c
@@ -3,7 +3,8 @@
* lotest.c
* test using large objects with libpq
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/tutorial/beard.c b/src/tutorial/beard.c
index d94dc6efe3..832238e461 100644
--- a/src/tutorial/beard.c
+++ b/src/tutorial/beard.c
@@ -3,7 +3,8 @@
* beard.c
* sample routines to use large objects
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/utils/strdup.c b/src/utils/strdup.c
index cc0f81758b..daba143640 100644
--- a/src/utils/strdup.c
+++ b/src/utils/strdup.c
@@ -3,7 +3,8 @@
* strdup.c
* copies a null-terminated string.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/utils/version.c b/src/utils/version.c
index 125106b67c..5550d49832 100644
--- a/src/utils/version.c
+++ b/src/utils/version.c
@@ -3,7 +3,8 @@
* version.c
* Routines to handle Postgres version number.
*
- * Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION