From 283964ee4dd1b447e3f7a847802ef183f7ac5e74 Mon Sep 17 00:00:00 2001 From: Thomas Munro Date: Mon, 19 Aug 2024 21:21:03 +1200 Subject: [PATCH] Fix harmless LC_COLLATE[_MASK] confusion. Commit ca051d8b101 called newlocale(LC_COLLATE, ...) instead of newlocale(LC_COLLATE_MASK, ...), in code reached only on FreeBSD. They have the same value on that OS, explaining why it worked. Fix. Back-patch to 14, where ca051d8b101 landed. --- src/backend/utils/adt/pg_locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index 99a21f20b9f..cc28409956c 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -1683,7 +1683,7 @@ get_collation_actual_version(char collprovider, const char *collcollate) locale_t loc; /* Look up FreeBSD collation version. */ - loc = newlocale(LC_COLLATE, collcollate, NULL); + loc = newlocale(LC_COLLATE_MASK, collcollate, NULL); if (loc) { collversion =