Merge branch 'master' into PGPRO9_6

Vladimir Ershov · Vladimir Ershov · commit d446e298b5ac · 2017-05-02T15:28:13.000+03:00
diff --git a/expected/sr_plan.out b/expected/sr_plan.out
@@ -83,3 +83,4 @@ SELECT * FROM test_table WHERE test_attr1 = 15;
 ------------+------------
 (0 rows)
 
+RESET client_min_messages;
diff --git a/sql/sr_plan.sql b/sql/sr_plan.sql
@@ -26,3 +26,5 @@ SELECT * FROM test_table WHERE test_attr1 = _p(10);
 SELECT * FROM test_table WHERE test_attr1 = 10;
 SELECT * FROM test_table WHERE test_attr1 = 10;
 SELECT * FROM test_table WHERE test_attr1 = 15;
+
+RESET client_min_messages;

Original file line number	Diff line number	Diff line change
`@@ -83,3 +83,4 @@ SELECT * FROM test_table WHERE test_attr1 = 15;`
`83`	`83`	`------------+------------`
`84`	`84`	`(0 rows)`
`85`	`85`
	`86`	`+RESET client_min_messages;`