Merge branch 'PGPRO9_5' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into PGPRO9_5

vbwagner · vbwagner · commit 9764b25f5ca2 · 2016-03-28T12:10:06.000+03:00
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
@@ -45,6 +45,9 @@
 
 static int strcmp_icu(char *arg1, int len1, char *arg2, int len2);
 static int strxfrm_icu(char *dst, char *src, int len);
+
+/* We are going to use strxfrm from ICU which we trust in */
+#define TRUST_STRXFRM
 #endif /* USE_ICU */
 
 
