Avoid repeated invalidation on plans because of mismatch in search_path

diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c
index c7a66ae7309c1db4e6b508290d689192bcf3883d..5f15d19f728a843de20271cfcdb0da32392f78a9 100644 (file)
--- 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