database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-31 22:04:40 +03:00
Code Activity

Oops, I fumbled the backpatch of pg_upgrade changes.

Browse Source 
Somehow I got 9.2 and 9.4 correct, but fumbled 9.3.
This commit is contained in:
Heikki Linnakangas
2014-10-25 20:59:22 +03:00
parent 8f80dcf3c6
commit 9945f4e0f5
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/pg_upgrade/check.c
View File

@ -395,14 +395,17 @@ check_locale_and_encoding(ControlData *oldctrl,
ControlData *newctrl) ControlData *newctrl)
{ {
if (!equivalent_locale(LC_COLLATE, oldctrl->lc_collate, newctrl->lc_collate)) 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", pg_log(PG_FATAL,
oldctrl->lc_collate, newctrl->lc_collate); "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)) 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", pg_log(PG_FATAL,
oldctrl->lc_ctype, newctrl->lc_ctype); "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)) if (!equivalent_encoding(oldctrl->encoding, newctrl->encoding))
pg_fatal("encoding cluster values do not match: old \"%s\", new \"%s\"\n", pg_log(PG_FATAL,
oldctrl->encoding, newctrl->encoding); "encoding cluster values do not match: old \"%s\", new \"%s\"\n",
oldctrl->encoding, newctrl->encoding);
} }
/* /*