Silence compiler warning from older compilers.

Our RHEL7-vintage buildfarm animals are complaining about
"the comparison will always evaluate as true" for a usage of
SOFT_ERROR_OCCURRED() on a local variable.  This is the same
issue addressed in 7bc88c3d6 and some earlier commits, so solve
it the same way: write "escontext.error_occurred" instead.

Problem dates to recent commit a0b6ef29a, no need for back-patch.

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 219f604df7b116b2b752a71597d4e61674ad7f3e..c69c12dc014d7fae52cc5993cbb1f4bb264f86cb 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -7628,7 +7628,7 @@ ATExecAddColumn(List **wqueue, AlteredTableInfo *tab, Relation rel,
                                 * Phase 3 will re-evaluate with hard errors, so the user gets
                                 * an error only if the table has rows.
                                 */
-                               if (SOFT_ERROR_OCCURRED(&escontext))
+                               if (escontext.error_occurred)
                                {
                                        missingIsNull = true;
                                        tab->rewrite |= AT_REWRITE_DEFAULT_VAL;