From: Shigeru Hanada <hanada@metrosystems.co.jp>
Date: Mon, 18 Oct 2010 01:12:25 +0000 (+0900)
Subject: Merge branch 'master' into fdw_select_simple
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=95fd2a617afc00a1fd8268f06c350df0d30d12a1;p=users%2Fhanada%2Fpostgres.git

Merge branch 'master' into fdw_select_simple
---

95fd2a617afc00a1fd8268f06c350df0d30d12a1
diff --cc src/include/nodes/nodes.h
index 9067ef7ed5,15dabe31ce..a24fb90ec9
--- a/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,