Merge branch 'master' into PGPRO9_6

Author: Vladimir Ershov

expected/sr_plan.out

@@ -1,4 +1,5 @@
 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);
@@ -34,16 +35,19 @@ 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)

sql/sr_plan.sql

@@ -1,4 +1,5 @@
 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;
@@ -24,4 +25,4 @@ CREATE TABLE test_table(test_attr1 int, test_attr2 int);
 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;
+SELECT * FROM test_table WHERE test_attr1 = 15;

sr_plan.c

@@ -226,7 +226,7 @@ PlannedStmt *sr_planner(Query *parse,
 
 	if (find_ok)
 	{
-		/* elog(WARNING, "Ok we find saved plan."); */
+		elog(LOG, "Ok we find saved plan.");
 		out_jsonb2 = (Jsonb *)DatumGetPointer(PG_DETOAST_DATUM(search_values[3]));
 		if (query_params != NULL)
 			pl_stmt = jsonb_to_node_tree(out_jsonb2, &replace_fake);