database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-02 11:44:50 +03:00
Code

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

Browse Source 
This reverts commit 9f90b1d08d796a925808b24f77f624a0ff682c77.

This needs some refinements in the pg_dump and pg_upgrade tests.
This commit is contained in:
Peter Eisentraut 2019-10-09 21:36:01 +02:00
parent 9f90b1d08d
commit 50518ec296
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/backend/utils/adt/pg_locale.c
View File

@ -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)
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)
} }
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;
} }