From e4caf049713047e54ed0fbdfb9a12040553b192b Mon Sep 17 00:00:00 2001
From: Pavan Deolasee <pavan.deolasee@gmail.com>
Date: Wed, 9 Dec 2015 13:29:48 +0530
Subject: [PATCH] Avoid repeated invalidation on plans because of mismatch in
 search_path

---
 src/backend/catalog/namespace.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c
index c7a66ae730..5f15d19f72 100644
--- a/src/backend/catalog/namespace.c
+++ b/src/backend/catalog/namespace.c
@@ -3254,9 +3254,15 @@ OverrideSearchPathMatchesCurrent(OverrideSearchPath *path)
 		else
 			return false;
 	}
+
 	/* If path->addCatalog, next item should be pg_catalog. */
 	if (path->addCatalog)
 	{
+		if (lc && lfirst_oid(lc) == STORM_CATALOG_NAMESPACE)
+			lc = lnext(lc);
+		else
+			return false;
+
 		if (lc && lfirst_oid(lc) == PG_CATALOG_NAMESPACE)
 			lc = lnext(lc);
 		else
-- 
2.39.5