Merge commit 'fa41186e604357e96a5dc00d4dfa30f681debdd7' into PGPROEE9_6_ALPHA

Author: Vladimir Ershov

contrib/sr_plan/expected/sr_plan.out

@@ -1,5 +1,4 @@
 CREATE EXTENSION sr_plan;
-set client_min_messages = LOG;
 CREATE TABLE test_table(test_attr1 int, test_attr2 int);
 SET sr_plan.write_mode = true;
 SELECT * FROM test_table WHERE test_attr1 = _p(10);
@@ -35,19 +34,16 @@ SELECT * FROM test_table WHERE test_attr1 = 15;
 
 UPDATE sr_plans SET enable = true;
 SELECT * FROM test_table WHERE test_attr1 = _p(10);
-LOG:  Ok we find saved plan.
  test_attr1 | test_attr2 
 ------------+------------
 (0 rows)
 
 SELECT * FROM test_table WHERE test_attr1 = _p(15);
-LOG:  Ok we find saved plan.
  test_attr1 | test_attr2 
 ------------+------------
 (0 rows)
 
 SELECT * FROM test_table WHERE test_attr1 = 10;
-LOG:  Ok we find saved plan.
  test_attr1 | test_attr2 
 ------------+------------
 (0 rows)
@@ -83,4 +79,3 @@ SELECT * FROM test_table WHERE test_attr1 = 15;
 ------------+------------
 (0 rows)
 
-RESET client_min_messages;

contrib/sr_plan/sql/sr_plan.sql

@@ -1,5 +1,4 @@
 CREATE EXTENSION sr_plan;
-set client_min_messages = LOG;
 
 CREATE TABLE test_table(test_attr1 int, test_attr2 int);
 SET sr_plan.write_mode = true;
@@ -26,5 +25,3 @@ 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;