I wrote: > I'll run with Alvaro's suggestion, then. And done. In the event I realized that there's no point in back-patching this, because 80aa9848b already changed all the call sites of pgfdw_report_error, so we're already going to have issues back-patching any fixes that touch those.
regards, tom lane