Undo wrong fix in pl_exec.c

knizhnik · knizhnik · commit d220eb97694a · 2017-02-01T16:16:52.000+03:00
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
@@ -1230,15 +1230,15 @@ exec_stmt_block(PLpgSQL_execstate *estate, PLpgSQL_stmt_block *block)
 			edata = CopyErrorData();
 			FlushErrorState();
 
-			estate->eval_econtext = old_eval_econtext;
-
 			plpgsql_destroy_econtext(estate);
 
 			old_shared_estate = shared_simple_eval_estate;
 			shared_simple_eval_estate = NULL;
 			AbortCurrentTransaction();
 			shared_simple_eval_estate = old_shared_estate;
 
+			estate->eval_econtext = old_eval_econtext;
+
 			if (block->exceptions)
 			{
 				/* Look for a matching exception handler */
