Commit392073c

committed

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

2 parents6a7ac5e +7bc88be commit392073cCopy full SHA for 392073c

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,12 @@ gtrgm_consistent(PG_FUNCTION_ARGS)`
`296`	`296`
`297`	`297`	`if (GIST_LEAF(entry))`
`298`	`298`	`{/* all leafs contains orig trgm */`
`299`		`-float4tmpsml=cnt_sml(qtrg,key,*recheck);`
	`299`	`+/*`
	`300`	`+ * Prevent gcc optimizing the tmpsml variable using volatile`
	`301`	`+ * keyword. Otherwise comparison of nlimit and tmpsml may give`
	`302`	`+ * wrong results.`
	`303`	`+ */`
	`304`	`+float4volatiletmpsml=cnt_sml(qtrg,key,*recheck);`
`300`	`305`
`301`	`306`	`/* strange bug at freebsd 5.2.1 and gcc 3.3.3 */`
`302`	`307`	`res= ((int)&tmpsml==(int)&nlimit\|\|tmpsml>nlimit);`

Comments

(0)