Merge branch 'master' into fdw_select_simple
authorShigeru Hanada <hanada@metrosystems.co.jp>
Mon, 22 Nov 2010 00:29:53 +0000 (09:29 +0900)
committerShigeru Hanada <hanada@metrosystems.co.jp>
Mon, 22 Nov 2010 00:29:53 +0000 (09:29 +0900)
commit0fb82f64e8a42d2330c6c78cdabb9db5d4567cba
treecacaca742f972b1ba936ce5ca9e4bb3b64151cb4
parent55aa1a0e0134d1d2eaa93fffc4d9f013e6922d3a
parent506070be34dcdf35fd91c12c6745c745716de1d4
Merge branch 'master' into fdw_select_simple
contrib/dblink/dblink.c
src/backend/optimizer/path/allpaths.c
src/backend/optimizer/path/costsize.c
src/backend/optimizer/util/plancat.c
src/include/catalog/pg_proc.h
src/include/nodes/relation.h
src/include/optimizer/cost.h
src/include/utils/builtins.h