postgres
diff --git a/‎contrib/postgres_fdw/expected/postgres_fdw.out
Copy file name to clipboardExpand all lines: contrib/postgres_fdw/expected/postgres_fdw.out
+2-2Lines changed: 2 additions & 2 deletions b/‎contrib/postgres_fdw/expected/postgres_fdw.out
Copy file name to clipboardExpand all lines: contrib/postgres_fdw/expected/postgres_fdw.out
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/backend/foreign/foreign.c
Copy file name to clipboardExpand all lines: src/backend/foreign/foreign.c
+6-2Lines changed: 6 additions & 2 deletions b/‎src/backend/foreign/foreign.c
Copy file name to clipboardExpand all lines: src/backend/foreign/foreign.c
+6-2Lines changed: 6 additions & 2 deletions
@@ -2717,10 +2717,10 @@ ALTER FOREIGN TABLE ft4 OPTIONS (ADD use_remote_estimate 'true');
 -- regress_view_owner_another, the view owner, though it fails as expected
 -- due to the lack of a user mapping for that user.
 EXPLAIN (VERBOSE, COSTS OFF) SELECT * FROM v4;
-ERROR:  user mapping not found for "regress_view_owner_another"
+ERROR:  user mapping not found for user "regress_view_owner_another", server "loopback"
 -- Likewise, but with the query under an UNION ALL
 EXPLAIN (VERBOSE, COSTS OFF) SELECT * FROM (SELECT * FROM v4 UNION ALL SELECT * FROM v4);
-ERROR:  user mapping not found for "regress_view_owner_another"
+ERROR:  user mapping not found for user "regress_view_owner_another", server "loopback"
 -- Should not get that error once a user mapping is created
 CREATE USER MAPPING FOR regress_view_owner_another SERVER loopback OPTIONS (password_required 'false');
 EXPLAIN (VERBOSE, COSTS OFF) SELECT * FROM v4;
 
@@ -217,10 +217,14 @@ GetUserMapping(Oid userid, Oid serverid)
 	}
 
 	if (!HeapTupleIsValid(tp))
+	{
+		ForeignServer *server = GetForeignServer(serverid);
+
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_OBJECT),
-				 errmsg("user mapping not found for \"%s\"",
-						MappingUserName(userid))));
+				 errmsg("user mapping not found for user \"%s\", server \"%s\"",
+						MappingUserName(userid), server->servername)));
+	}
 
 	um = (UserMapping *) palloc(sizeof(UserMapping));
 	um->umid = ((Form_pg_user_mapping) GETSTRUCT(tp))->oid;