From 7cecabca8fdc0ced666369a37b45df3182886230 Mon Sep 17 00:00:00 2001
From: Noah Misch <noah@leadboat.com>
Date: Tue, 20 Oct 2015 00:57:25 -0400
Subject: [PATCH] Fix back-patch of commit
 8e3b4d9d40244c037bbc6e182ea3fabb9347d482.

master emits an extra context message compared to 9.5 and earlier.
---
 src/test/regress/expected/plpgsql.out | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
index b2cd59c88b9..96c1cfbeb80 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 $$
-- 
2.39.5