Merge branch 'plpgsql_hook_test'

Conflicts:
	pg_hint_plan.c

diff --cc pg_hint_plan.c
index 60008d3,db1082a..9ec5765
--- 1/pg_hint_plan.c
--- 2/pg_hint_plan.c
+++ b/pg_hint_plan.c
@@@ -36,8 -36,7 +36,9 @@@
  #include "catalog/pg_class.h"
  #endif
  
 +#include "executor/spi.h"
 +#include "catalog/pg_type.h"
+ #include "plpgsql.h"
  
  #ifdef PG_MODULE_MAGIC
  PG_MODULE_MAGIC;