From 9945f4e0f546f2e53b430fba32831ae6c73abb78 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Sat, 25 Oct 2014 20:59:22 +0300 Subject: [PATCH] Oops, I fumbled the backpatch of pg_upgrade changes. Somehow I got 9.2 and 9.4 correct, but fumbled 9.3. --- contrib/pg_upgrade/check.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c index 1d42f790479..50597dba94b 100644 --- a/contrib/pg_upgrade/check.c +++ b/contrib/pg_upgrade/check.c @@ -395,14 +395,17 @@ check_locale_and_encoding(ControlData *oldctrl, ControlData *newctrl) { if (!equivalent_locale(LC_COLLATE, oldctrl->lc_collate, newctrl->lc_collate)) - pg_fatal("lc_collate cluster values do not match: old \"%s\", new \"%s\"\n", - oldctrl->lc_collate, newctrl->lc_collate); + pg_log(PG_FATAL, + "lc_collate cluster values do not match: old \"%s\", new \"%s\"\n", + oldctrl->lc_collate, newctrl->lc_collate); if (!equivalent_locale(LC_CTYPE, oldctrl->lc_ctype, newctrl->lc_ctype)) - pg_fatal("lc_ctype cluster values do not match: old \"%s\", new \"%s\"\n", - oldctrl->lc_ctype, newctrl->lc_ctype); + pg_log(PG_FATAL, + "lc_ctype cluster values do not match: old \"%s\", new \"%s\"\n", + oldctrl->lc_ctype, newctrl->lc_ctype); if (!equivalent_encoding(oldctrl->encoding, newctrl->encoding)) - pg_fatal("encoding cluster values do not match: old \"%s\", new \"%s\"\n", - oldctrl->encoding, newctrl->encoding); + pg_log(PG_FATAL, + "encoding cluster values do not match: old \"%s\", new \"%s\"\n", + oldctrl->encoding, newctrl->encoding); } /* -- 2.39.5