]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
Fix harmless LC_COLLATE[_MASK] confusion.
authorThomas Munro <tmunro@postgresql.org>
Mon, 19 Aug 2024 09:21:03 +0000 (21:21 +1200)
committerThomas Munro <tmunro@postgresql.org>
Mon, 19 Aug 2024 10:22:20 +0000 (22:22 +1200)
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

index 453af401cabffe481f363d8a766d76d82699cdc5..b81b9442d858dc291c0a86c41e81359ada340a04 100644 (file)
@@ -1680,7 +1680,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 =