Commitdaaf1ec

committed

Fixes to avoid merge conflicts

1 parentc34b1fe commitdaaf1ecCopy full SHA for daaf1ec

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -888,11 +888,10 @@ init_deactivated_queries_storage(void)`
`888`	`888`	`MemSet(&hash_ctl,0,sizeof(hash_ctl));`
`889`	`889`	`hash_ctl.keysize=sizeof(int);`
`890`	`890`	`hash_ctl.entrysize=sizeof(int);`
`891`		`-hash_ctl.hash=uint32_hash;`
`892`	`891`	`deactivated_queries=hash_create("aqo_deactivated_queries",`
`893`	`892`	`128,/* start small and extend */`
`894`	`893`	`&hash_ctl,`
`895`		`-HASH_ELEM \|HASH_FUNCTION);`
	`894`	`+HASH_ELEM \|HASH_BLOBS);`
`896`	`895`	`}`
`897`	`896`
`898`	`897`	`/* Destroys the storage for hash of deactivated queries */`

Comments

(0)