From: Andres Freund <andres@anarazel.de> Date: Thu, 24 Aug 2017 22:07:40 +0000 (-0700) Subject: Fix harmless thinko in dsa.c. X-Git-Tag: REL_11_BETA1~1738 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20fbf25533763c8c78c9c668b718d831236fb111;p=postgresql Fix harmless thinko in dsa.c. Commit 16be2fd100199bdf284becfcee02c5eb20d8a11d added DSA_ALLOC_HUGE, DSA_ALLOC_ZERO and DSA_ALLOC_NO_OOM which have the same numerical values and meanings as the similarly named MCXT_... macros. In one place we accidentally used MCXT_ALLOC_NO_OOM when DSA_ALLOC_NO_OOM is wanted, so tidy that up. Author: Thomas Munro Discussion: http://postgr.es/m/CAEepm=2AimHxVkkxnMfQvbZMkXy0uKbVa0-D38c5-qwrCm4CMQ@mail.gmail.com Backpatch: 10, where dsa was introduced. --- diff --git a/src/backend/utils/mmgr/dsa.c b/src/backend/utils/mmgr/dsa.c index b3327f676b..fe62788188 100644 --- a/src/backend/utils/mmgr/dsa.c +++ b/src/backend/utils/mmgr/dsa.c @@ -707,7 +707,7 @@ dsa_allocate_extended(dsa_area *area, Size size, int flags) dsa_free(area, span_pointer); /* Raise error unless asked not to. */ - if ((flags & MCXT_ALLOC_NO_OOM) == 0) + if ((flags & DSA_ALLOC_NO_OOM) == 0) ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of memory"),