Alvaro Herrera <alvherre@2ndquadrant.com> writes:
> I ended up with these two patches. I'm not sure about pushing
> separately. It seems pointless to backport the "fix" to back branches
> anyway.
Patch passes the eyeball test, though I did not try to run it.
I concur with squashing into one commit and applying to HEAD only.
regards, tom lane