Commit50518ec

committed

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

This reverts commit9f90b1d.This needs some refinements in the pg_dump and pg_upgrade tests.

1 parent9f90b1d commit50518ecCopy full SHA for 50518ec

File tree

-12

lines changed

-12

lines changed

Lines changed: 2 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,6 @@`
`70`	`70`	`#include<unicode/ucnv.h>`
`71`	`71`	`#endif`
`72`	`72`
`73`		`-#ifdef__GLIBC__`
`74`		`-#include<gnu/libc-version.h>`
`75`		`-#endif`
`76`		`-`
`77`	`73`	`#ifdefWIN32`
`78`	`74`	`/*`
`79`	`75`	`* 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`	`1499`	`char*`
`1504`	`1500`	`get_collation_actual_version(charcollprovider,constchar*collcollate)`
`1505`	`1501`	`{`
`1506`		`-char*collversion=NULL;`
	`1502`	`+char*collversion;`
`1507`	`1503`
`1508`	`1504`	`#ifdefUSE_ICU`
`1509`	`1505`	`if (collprovider==COLLPROVIDER_ICU)`
`@@ -1527,13 +1523,7 @@ get_collation_actual_version(char collprovider, const char *collcollate)`
`1527`	`1523`	`}`
`1528`	`1524`	`else`
`1529`	`1525`	`#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;`
`1537`	`1527`
`1538`	`1528`	`returncollversion;`
`1539`	`1529`	`}`

Comments

(0)