From: Shigeru Hanada <hanada@metrosystems.co.jp>
Date: Fri, 8 Oct 2010 00:38:19 +0000 (+0900)
Subject: Merge branch 'master' into fdw_select
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=4e1bd4358b73d13b0c61dfb044a83ef93c276039;p=users%2Fhanada%2Fpostgres.git

Merge branch 'master' into fdw_select

Conflicts:
	src/backend/optimizer/plan/createplan.c
---

4e1bd4358b73d13b0c61dfb044a83ef93c276039
diff --cc src/backend/optimizer/plan/createplan.c
index d2734907c3,2c398d2eed..edf9f8bc8e
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@@ -20,7 -20,7 +20,8 @@@
  #include <math.h>
  
  #include "access/skey.h"
 +#include "catalog/pg_class.h"
+ #include "miscadmin.h"
  #include "nodes/makefuncs.h"
  #include "nodes/nodeFuncs.h"
  #include "optimizer/clauses.h"