postgres.git / summary / log / commit / refs

commit    50518ec296aea3af3e00c43c2ccef74c96cb5762
Author:   Peter Eisentraut <peter@eisentraut.org>
Date:     Wed Oct 09 19:36:01 2019 +0000

    Revert "Use libc version as a collation version on glibc systems."
    
    This reverts commit 9f90b1d08d796a925808b24f77f624a0ff682c77.
    
    This needs some refinements in the pg_dump and pg_upgrade tests.


 src/backend/utils/adt/pg_locale.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index fcdbaae37b9..2a076a3dfd1 100644
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -70,10 +70,6 @@
 #include <unicode/ucnv.h>
 #endif
 
-#ifdef __GLIBC__
-#include <gnu/libc-version.h>
-#endif
-
 #ifdef WIN32
 /*
  * This Windows file defines StrNCpy. We don't need it here, so we undefine
@@ -1503,7 +1499,7 @@ pg_newlocale_from_collation(Oid collid)
 char *
 get_collation_actual_version(char collprovider, const char *collcollate)
 {
-	char	   *collversion = NULL;
+	char	   *collversion;
 
 #ifdef USE_ICU
 	if (collprovider == COLLPROVIDER_ICU)
@@ -1527,13 +1523,7 @@ get_collation_actual_version(char collprovider, const char *collcollate)
 	}
 	else
 #endif
-	if (collprovider == COLLPROVIDER_LIBC)
-	{
-#if defined(__GLIBC__)
-		/* Use the glibc version because we don't have anything better. */
-		collversion = pstrdup(gnu_get_libc_version());
-#endif
-	}
+		collversion = NULL;
 
 	return collversion;
 }


[parent: 9f90b1d08d79]