NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit41839b7

committed

Fix ICU collation use on Windows

Windows uses a separate code path for libc locales. The code previouslyended up there also if an ICU collation should be used, leading to acrash.Reported-by: Ashutosh Sharma <ashu.coek88@gmail.com>

1 parent3ef97e7 commit41839b7Copy full SHA for 41839b7

File tree

1 file changed

-1

lines changed

src/backend/utils/adt
- varlena.c

1 file changed

-1

lines changed

`‎src/backend/utils/adt/varlena.c`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1433,7 +1433,8 @@ varstr_cmp(char arg1, int len1, char arg2, int len2, Oid collid)`
`1433`	`1433`
`1434`	`1434`	`#ifdefWIN32`
`1435`	`1435`	`/* Win32 does not have UTF-8, so we need to map to UTF-16 */`
`1436`		`-if (GetDatabaseEncoding()==PG_UTF8)`
	`1436`	`+if (GetDatabaseEncoding()==PG_UTF8`
	`1437`	`+&& (!mylocale\|\|mylocale->provider==COLLPROVIDER_LIBC))`
`1437`	`1438`	`{`
`1438`	`1439`	`inta1len;`
`1439`	`1440`	`inta2len;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit41839b7

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/varlena.c`

0 commit comments