The attached patch combines work from two patches recently posted byBruce Momjian, along with a necessary change to guc.c which is missingfrom those patches.
Please ignore all prior patches with this subject line and considerthis a rollup.
-Kevin