Skip to content

Commit 50518ec

Browse files
committed
Revert "Use libc version as a collation version on glibc systems."
This reverts commit 9f90b1d. This needs some refinements in the pg_dump and pg_upgrade tests.
1 parent 9f90b1d commit 50518ec

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

src/backend/utils/adt/pg_locale.c

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@
7070
#include <unicode/ucnv.h>
7171
#endif
7272

73-
#ifdef __GLIBC__
74-
#include <gnu/libc-version.h>
75-
#endif
76-
7773
#ifdef WIN32
7874
/*
7975
* This Windows file defines StrNCpy. We don't need it here, so we undefine
@@ -1503,7 +1499,7 @@ pg_newlocale_from_collation(Oid collid)
15031499
char *
15041500
get_collation_actual_version(char collprovider, const char *collcollate)
15051501
{
1506-
char *collversion = NULL;
1502+
char *collversion;
15071503

15081504
#ifdef USE_ICU
15091505
if (collprovider == COLLPROVIDER_ICU)
@@ -1527,13 +1523,7 @@ get_collation_actual_version(char collprovider, const char *collcollate)
15271523
}
15281524
else
15291525
#endif
1530-
if (collprovider == COLLPROVIDER_LIBC)
1531-
{
1532-
#if defined(__GLIBC__)
1533-
/* Use the glibc version because we don't have anything better. */
1534-
collversion = pstrdup(gnu_get_libc_version());
1535-
#endif
1536-
}
1526+
collversion = NULL;
15371527

15381528
return collversion;
15391529
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy