postgres.git / summary / log / commit / refs
commit 1eb2231fc46bbfa85b47c19d88f72162b323aa51
Author: Peter Eisentraut <peter_e@gmx.net>
Date: Thu Apr 07 16:22:34 2011 +0000
First released in: 9.1.0
Allow pg_upgrade with PGCLIENTENCODING set
This used to work, but since PGCLIENTENCODING is now a connection
option variable, pg_upgrade would prevent it.
contrib/pg_upgrade/server.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c
index b0df99cede6..a7d57872346 100644
--- a/contrib/pg_upgrade/server.c
+++ b/contrib/pg_upgrade/server.c
@@ -326,21 +326,26 @@ check_for_libpq_envvars(void)
/* Get valid libpq env vars from the PQconndefaults function */
- start = option = PQconndefaults();
+ start = PQconndefaults();
- while (option->keyword != NULL)
+ for (option = start; option->keyword != NULL; option++)
{
- const char *value;
-
- if (option->envvar && (value = getenv(option->envvar)) && strlen(value) > 0)
+ if (option->envvar)
{
- found = true;
+ const char *value;
- pg_log(PG_WARNING,
- "libpq env var %-20s is currently set to: %s\n", option->envvar, value);
- }
+ if (strcmp(option->envvar, "PGCLIENTENCODING") == 0)
+ continue;
- option++;
+ value = getenv(option->envvar);
+ if (value && strlen(value) > 0)
+ {
+ found = true;
+
+ pg_log(PG_WARNING,
+ "libpq env var %-20s is currently set to: %s\n", option->envvar, value);
+ }
+ }
}
/* Free the memory that libpq allocated on our behalf */
[parent: 1471a147f09f]