Merge branch 'master' into fdw_select_simple

diff --cc doc/src/sgml/catalogs.sgml
Simple merge

diff --cc doc/src/sgml/ref/select.sgml
Simple merge

diff --cc src/backend/commands/explain.c
Simple merge

diff --cc src/backend/executor/Makefile
Simple merge

diff --cc src/backend/executor/execAmi.c
Simple merge

diff --cc src/backend/executor/execProcnode.c
Simple merge

diff --cc src/backend/nodes/copyfuncs.c
Simple merge

diff --cc src/backend/nodes/equalfuncs.c
Simple merge

diff --cc src/backend/nodes/outfuncs.c
Simple merge

diff --cc src/backend/optimizer/path/allpaths.c
Simple merge

diff --cc src/backend/optimizer/path/costsize.c
Simple merge

diff --cc src/backend/optimizer/plan/createplan.c
Simple merge

diff --cc src/backend/optimizer/plan/setrefs.c
Simple merge

diff --cc src/backend/optimizer/plan/subselect.c
Simple merge

diff --cc src/backend/optimizer/util/pathnode.c
Simple merge

diff --cc src/backend/parser/analyze.c
Simple merge

diff --cc src/backend/parser/gram.y
Simple merge

diff --cc src/backend/parser/parse_utilcmd.c
Simple merge

diff --cc src/include/nodes/execnodes.h
Simple merge

diff --cc src/include/nodes/nodes.h
index 9067ef7ed59eba1ed310fcecd17b52f0db166629,15dabe31ce39750f35e77ebcaf274ff40df313a0..a24fb90ec921fc1e0aa69864d5c7bcd22303d632
--- 1/src/include/nodes/nodes.h
--- 2/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@@ -216,8 -216,8 +218,9 @@@ typedef enum NodeTa
    T_MergePath,
    T_HashPath,
    T_TidPath,
 +  T_ForeignPath,
    T_AppendPath,
+   T_MergeAppendPath,
    T_ResultPath,
    T_MaterialPath,
    T_UniquePath,

diff --cc src/include/nodes/parsenodes.h
Simple merge

diff --cc src/include/nodes/plannodes.h
Simple merge

diff --cc src/include/nodes/relation.h
Simple merge

diff --cc src/include/optimizer/cost.h
Simple merge

diff --cc src/include/optimizer/pathnode.h
Simple merge