postgres
diff --git a/‎src/backend/utils/cache/relcache.c
Copy file name to clipboardExpand all lines: src/backend/utils/cache/relcache.c
+7-5Lines changed: 7 additions & 5 deletions b/‎src/backend/utils/cache/relcache.c
Copy file name to clipboardExpand all lines: src/backend/utils/cache/relcache.c
+7-5Lines changed: 7 additions & 5 deletions
@@ -3529,6 +3529,13 @@ RelationBuildLocalRelation(const char *relname,
 
 	rel->rd_rel->relam = accessmtd;
 
+	/*
+	 * RelationInitTableAccessMethod will do syscache lookups, so we mustn't
+	 * run it in CacheMemoryContext.  Fortunately, the remaining steps don't
+	 * require a long-lived current context.
+	 */
+	MemoryContextSwitchTo(oldcxt);
+
 	if (relkind == RELKIND_RELATION ||
 		relkind == RELKIND_SEQUENCE ||
 		relkind == RELKIND_TOASTVALUE ||
@@ -3552,11 +3559,6 @@ RelationBuildLocalRelation(const char *relname,
 	 */
 	EOXactListAdd(rel);
 
-	/*
-	 * done building relcache entry.
-	 */
-	MemoryContextSwitchTo(oldcxt);
-
 	/* It's fully valid */
 	rel->rd_isvalid = true;