Merge pull request #2971 from citusdata/fix-pg12

Fix pg12 compile
2019-09-13 17:34:57 +00:00 · 2019-09-13 17:34:57 +00:00 · 482f3b1474
parent 4bbf65d913 5e5f4628a0
commit 482f3b1474
2 changed files with 5 additions and 1 deletions
--- a/src/backend/distributed/executor/local_executor.c
+++ b/src/backend/distributed/executor/local_executor.c
@ -83,7 +83,11 @@
 #include "distributed/transaction_management.h"
 #include "executor/tstoreReceiver.h"
 #include "executor/tuptable.h"
+#if PG_VERSION_NUM >= 120000
+#include "optimizer/optimizer.h"
+#else
 #include "optimizer/planner.h"
+#endif
 #include "nodes/params.h"
 #include "utils/snapmgr.h"

--- a/src/test/regress/.gitignore
+++ b/src/test/regress/.gitignore
@ -18,4 +18,4 @@
 /proxy.output

 # python
-**.pyc
+*.pyc