diff options
| author | Bruce Momjian <bruce@momjian.us> | 2004-07-12 00:09:07 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2004-07-12 00:09:07 +0000 |
| commit | 118ec0daa8f922a7d5f545532d4d942814aa5748 (patch) | |
| tree | 48701052e90e1b6930906b04d66c9780d77eb76b /src | |
| parent | 0589ab68c51d11961c2b28d6733bf341506d2bf2 (diff) | |
| download | postgresql-118ec0daa8f922a7d5f545532d4d942814aa5748.tar.gz postgresql-118ec0daa8f922a7d5f545532d4d942814aa5748.zip | |
Canonicalize preload_libraries after it is split up, not before.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/init/miscinit.c | 3 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index fd1eb6d762b..2ae41c013c1 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.128 2004/07/11 23:49:48 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.129 2004/07/12 00:09:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -926,6 +926,7 @@ process_preload_libraries(char *preload_libraries_string) funcname = NULL; } + canonicalize_path(filename); initfunc = (func_ptr) load_external_function(filename, funcname, true, NULL); if (initfunc) diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 20bcf108206..de5701c9c76 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.217 2004/07/11 23:49:51 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.218 2004/07/12 00:09:07 momjian Exp $ * *-------------------------------------------------------------------- */ @@ -1557,7 +1557,7 @@ static struct config_string ConfigureNamesString[] = GUC_LIST_INPUT | GUC_LIST_QUOTE }, &preload_libraries_string, - "", assign_canonical_path, NULL + "", NULL, NULL }, { |