Fix harmless LC_COLLATE[_MASK] confusion.

macdice · macdice · commit f1707c5f4f64 · 2024-08-19T22:22:20.000+12:00
Commit ca051d8 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 ca051d8 landed.
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
@@ -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 =

Original file line number	Diff line number	Diff line change
`@@ -1680,7 +1680,7 @@ get_collation_actual_version(char collprovider, const char *collcollate)`
`1680`	`1680`	`locale_t loc;`
`1681`	`1681`
`1682`	`1682`	`/* Look up FreeBSD collation version. */`
`1683`		`- loc = newlocale(LC_COLLATE, collcollate, NULL);`
	`1683`	`+ loc = newlocale(LC_COLLATE_MASK, collcollate, NULL);`
`1684`	`1684`	`if (loc)`
`1685`	`1685`	`{`
`1686`	`1686`	`collversion =`