From: Noah Misch <noah@leadboat.com>
Date: Tue, 20 Oct 2015 04:57:25 +0000 (-0400)
Subject: Fix back-patch of commit 8e3b4d9d40244c037bbc6e182ea3fabb9347d482.
X-Git-Tag: REL9_1_20~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b97a41a7c0270be436b800a83abfffc18a5427a5;p=postgresql

Fix back-patch of commit 8e3b4d9d40244c037bbc6e182ea3fabb9347d482.

master emits an extra context message compared to 9.5 and earlier.
---

diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
index 29b38f2f3f..9a6fc82594 100644
--- a/src/test/regress/expected/plpgsql.out
+++ b/src/test/regress/expected/plpgsql.out
@@ -2062,7 +2062,6 @@ set statement_timeout to 2000;
 select trap_timeout();
 NOTICE:  nyeah nyeah, can't stop me
 ERROR:  end of function
-CONTEXT:  PL/pgSQL function trap_timeout() line 15 at RAISE
 rollback;
 -- Test for pass-by-ref values being stored in proper context
 create function test_variable_storage() returns text as $$