Merge branch 'master' into foreign_scan
authorShigeru Hanada <hanada@metrosystems.co.jp>
Thu, 17 Feb 2011 08:12:18 +0000 (17:12 +0900)
committerShigeru Hanada <hanada@metrosystems.co.jp>
Thu, 17 Feb 2011 08:12:18 +0000 (17:12 +0900)
commitd08817a28495bcdcb20482d9ba30a6893154a5ae
treef5ef3e1631b821ae934432c9a55f1f6b7f94bc51
parent2531f0bbc0c51cf9ae73738042bc17209af07bf1
parent93016983d1e8f3aeb508f1be8daf5ca5de5c5b61
Merge branch 'master' into foreign_scan
21 files changed:
doc/src/sgml/catalogs.sgml
src/backend/commands/foreigncmds.c
src/backend/nodes/copyfuncs.c
src/backend/nodes/equalfuncs.c
src/backend/nodes/outfuncs.c
src/backend/optimizer/plan/createplan.c
src/backend/optimizer/plan/setrefs.c
src/backend/optimizer/plan/subselect.c
src/backend/optimizer/util/plancat.c
src/backend/parser/gram.y
src/bin/pg_dump/pg_dump.c
src/bin/pg_dump/pg_dump.h
src/bin/psql/describe.c
src/include/catalog/pg_proc.h
src/include/catalog/pg_type.h
src/include/nodes/execnodes.h
src/include/nodes/nodes.h
src/include/nodes/parsenodes.h
src/include/nodes/plannodes.h
src/include/nodes/relation.h
src/include/utils/builtins.h