Merge branch 'PGPROEE9_6' of git.postgrespro.ru:pgpro-dev/postgrespro into PGPROEE9_6

Alexander Korotkov · Alexander Korotkov · commit 01563e6c8d6f · 2016-11-18T14:20:16.000+03:00
diff --git a/doc/src/sgml/pghintplan.sgml b/doc/src/sgml/pghintplan.sgml
@@ -126,10 +126,9 @@ postgres=#
           Planning</ulink> can have the expected effects on planning
           unless any other hint conflicts with the planner method
           configuration parameters. The last one among hints on the same
-          GUC parameter makes effect. <link linkend="pg-hint-plan-hint-GUC">GUC
-          parameters for pg_hint_plan</link> are also settable by this
-          hint but it won't work as your expectation. See
-          <link linkend="pg-hint-plan-restrictions">Restrictions</link> for details.
+          GUC parameter makes effect. GUC parameters for pg_hint_plan are also settable by this
+          hint but it won't work as your expectation. See restrictions for
+          details <xref linkend="pg-hint-plan-restrictions">.
         </para>
       </sect4>
     </sect3>
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
@@ -55,17 +55,17 @@ extern PGDLLIMPORT double parallel_setup_cost;
 extern PGDLLIMPORT int effective_cache_size;
 extern Cost disable_cost;
 extern int	max_parallel_workers_per_gather;
-extern bool enable_seqscan;
-extern bool enable_indexscan;
-extern bool enable_indexonlyscan;
-extern bool enable_bitmapscan;
-extern bool enable_tidscan;
+extern PGDLLIMPORT bool enable_seqscan;
+extern PGDLLIMPORT bool enable_indexscan;
+extern PGDLLIMPORT bool enable_indexonlyscan;
+extern PGDLLIMPORT bool enable_bitmapscan;
+extern PGDLLIMPORT bool enable_tidscan;
 extern bool enable_sort;
 extern bool enable_hashagg;
-extern bool enable_nestloop;
+extern PGDLLIMPORT bool enable_nestloop;
 extern bool enable_material;
-extern bool enable_mergejoin;
-extern bool enable_hashjoin;
+extern PGDLLIMPORT bool enable_mergejoin;
+extern PGDLLIMPORT bool enable_hashjoin;
 extern int	constraint_exclusion;
 
 extern double clamp_row_est(double nrows);
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
@@ -20,8 +20,8 @@
 /*
  * allpaths.c
  */
-extern bool enable_geqo;
-extern int	geqo_threshold;
+extern PGDLLIMPORT bool enable_geqo;
+extern PGDLLIMPORT int	geqo_threshold;
 extern int	min_parallel_relation_size;
 
 /* Hook for plugins to get control in set_rel_pathlist() */
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
@@ -262,7 +262,7 @@ extern char *HbaFileName;
 extern char *IdentFileName;
 extern char *external_pid_file;
 
-extern char *application_name;
+extern PGDLLIMPORT char *application_name;
 
 extern int	tcp_keepalives_idle;
 extern int	tcp_keepalives_interval;
