Commit 50518ec2 authored by Peter Eisentraut's avatar Peter Eisentraut

Revert "Use libc version as a collation version on glibc systems."

This reverts commit 9f90b1d0.

This needs some refinements in the pg_dump and pg_upgrade tests.
parent 9f90b1d0
...@@ -70,10 +70,6 @@ ...@@ -70,10 +70,6 @@
#include <unicode/ucnv.h> #include <unicode/ucnv.h>
#endif #endif
#ifdef __GLIBC__
#include <gnu/libc-version.h>
#endif
#ifdef WIN32 #ifdef WIN32
/* /*
* This Windows file defines StrNCpy. We don't need it here, so we undefine * This Windows file defines StrNCpy. We don't need it here, so we undefine
...@@ -1503,7 +1499,7 @@ pg_newlocale_from_collation(Oid collid) ...@@ -1503,7 +1499,7 @@ pg_newlocale_from_collation(Oid collid)
char * char *
get_collation_actual_version(char collprovider, const char *collcollate) get_collation_actual_version(char collprovider, const char *collcollate)
{ {
char *collversion = NULL; char *collversion;
#ifdef USE_ICU #ifdef USE_ICU
if (collprovider == COLLPROVIDER_ICU) if (collprovider == COLLPROVIDER_ICU)
...@@ -1527,13 +1523,7 @@ get_collation_actual_version(char collprovider, const char *collcollate) ...@@ -1527,13 +1523,7 @@ get_collation_actual_version(char collprovider, const char *collcollate)
} }
else else
#endif #endif
if (collprovider == COLLPROVIDER_LIBC) collversion = NULL;
{
#if defined(__GLIBC__)
/* Use the glibc version because we don't have anything better. */
collversion = pstrdup(gnu_get_libc_version());
#endif
}
return collversion; return collversion;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment