git.postgresql.org Git - users/hanada/postgres.git/commit - git.postgresql.org

projects / users / hanada / postgres.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7a4f50b fd223c7)

author	Shigeru Hanada <hanada@metrosystems.co.jp>
	Fri, 3 Dec 2010 07:45:58 +0000 (16:45 +0900)
committer	Shigeru Hanada <hanada@metrosystems.co.jp>
	Fri, 3 Dec 2010 07:45:58 +0000 (16:45 +0900)
commit	4e7083933e1fd8e61a70aa996e1fcb275ce20e17
tree	b488e512faf668e49fd43bae52a57ad6a1b6ada0	tree
parent	7a4f50bcc47a298ec852e40d6ee640b7bcb27514	commit \| diff
parent	fd223c7407c7067ac3ec7e586f9e3d7b5afd2b2e	commit \| diff

Merge branch 'master' into fdw_core

15 files changed:

doc/src/sgml/catalogs.sgml	diff1 \|	diff2 \|	blob \| history
src/backend/commands/explain.c	diff1 \|	diff2 \|	blob \| history
src/backend/nodes/copyfuncs.c	diff1 \|	diff2 \|	blob \| history
src/backend/nodes/outfuncs.c	diff1 \|	diff2 \|	blob \| history
src/backend/optimizer/path/costsize.c	diff1 \|	diff2 \|	blob \| history
src/backend/optimizer/plan/createplan.c	diff1 \|	diff2 \|	blob \| history
src/backend/optimizer/plan/setrefs.c	diff1 \|	diff2 \|	blob \| history
src/backend/optimizer/plan/subselect.c	diff1 \|	diff2 \|	blob \| history
src/backend/optimizer/util/pathnode.c	diff1 \|	diff2 \|	blob \| history
src/include/catalog/pg_proc.h	diff1 \|	diff2 \|	blob \| history
src/include/nodes/execnodes.h	diff1 \|	diff2 \|	blob \| history
src/include/nodes/plannodes.h	diff1 \|	diff2 \|	blob \| history
src/include/nodes/relation.h	diff1 \|	diff2 \|	blob \| history
src/include/optimizer/cost.h	diff1 \|	diff2 \|	blob \| history
src/include/optimizer/pathnode.h	diff1 \|	diff2 \|	blob \| history

Hanada's development tree.