git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c

index 9295e46aed3e1abe02e2bbcb2869516eacb834cf..72b5a5fde5a0f1b2f96b9e83fb1c81d72b8d396b 100644 (file)

--- a/src/bin/pg_upgrade/pg_upgrade.c

+++ b/src/bin/pg_upgrade/pg_upgrade.c

char *datcollate_literal;

char *datctype_literal;

char *datlocale_literal = NULL;

- char *datlocale_src;

DbLocaleInfo *locale = old_cluster.template0;

prep_status("Setting locale and encoding for new cluster");

datctype_literal = PQescapeLiteral(conn_new_template1,

locale->db_ctype,

strlen(locale->db_ctype));

- datlocale_src = locale->db_locale ? locale->db_locale : "NULL";

- datlocale_literal = PQescapeLiteral(conn_new_template1,

- datlocale_src,

- strlen(datlocale_src));

+

+ if (locale->db_locale)

+ datlocale_literal = PQescapeLiteral(conn_new_template1,

+ locale->db_locale,

+ strlen(locale->db_locale));

+ else

+ datlocale_literal = "NULL";

/* update template0 in new cluster */

if (GET_MAJOR_VERSION(new_cluster.major_version) >= 1700)

PQfreemem(datcollate_literal);

PQfreemem(datctype_literal);

- PQfreemem(datlocale_literal);

+ if (locale->db_locale)

+ PQfreemem(datlocale_literal);

PQfinish(conn_new_template1);