Commit9f90b1d

committed

Use libc version as a collation version on glibc systems.

Using glibc's version number to detect potential collation definitionchanges is not 100% reliable, but it's better than nothing.Author: Thomas MunroReviewed-by: Peter EisentrautDiscussion:https://postgr.es/m/4b76c6d4-ae5e-0dc6-7d0d-b5c796a07e34%402ndquadrant.com

1 parentb8e19b9 commit9f90b1dCopy full SHA for 9f90b1d

File tree

+12

-2

lines changed

+12

-2

lines changed

Lines changed: 12 additions & 2 deletions

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

Comments

(0)