postgres.git / summary / log / commit / refs

commit    c1bb534bae431f4bbc50abf471507457e1b24efc
Author:   Thomas Munro <tmunro@postgresql.org>
Date:     Mon Aug 19 09:21:03 2024 +0000
First released in: 18.0, 14.14, 15.9, 16.5, 17.0

    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 3c8fbe63a61..8f841c1d192 100644
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -1722,7 +1722,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 =


[parent: 4247575c637b]