summaryrefslogtreecommitdiff
path: root/src/backend/utils/init/miscinit.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2009-01-03 20:03:08 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2009-01-03 20:03:08 +0000
commit4605d1c98b305567a7addb22643a9cc7519315e9 (patch)
tree251a2d897ed7193c3090b85b3aa196f7d7393c7f /src/backend/utils/init/miscinit.c
parentdad75a62bfb25e3228d1db73e4a06e2c6bd22dd2 (diff)
Allow loadable modules to create PGC_POSTMASTER GUC variables, but only
when loaded via shared_preload_libraries. Needed for support of pg_stat_statements, or pretty much anything else that wants a GUC to control size of a shared memory allocation.
Diffstat (limited to 'src/backend/utils/init/miscinit.c')
-rw-r--r--src/backend/utils/init/miscinit.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 8e449487cc5..461918ed309 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.170 2009/01/01 17:23:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.171 2009/01/03 20:03:08 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1131,6 +1131,9 @@ ValidatePgVersion(const char *path)
char *shared_preload_libraries_string = NULL;
char *local_preload_libraries_string = NULL;
+/* Flag telling that we are loading shared_preload_libraries */
+bool process_shared_preload_libraries_in_progress = false;
+
/*
* load the shared libraries listed in 'libraries'
*
@@ -1197,9 +1200,11 @@ load_libraries(const char *libraries, const char *gucname, bool restricted)
void
process_shared_preload_libraries(void)
{
+ process_shared_preload_libraries_in_progress = true;
load_libraries(shared_preload_libraries_string,
"shared_preload_libraries",
false);
+ process_shared_preload_libraries_in_progress = false;
}
/*