Fixes to avoid merge conflicts

Author: dmpgpro

storage.c

@@ -888,11 +888,10 @@ init_deactivated_queries_storage(void)
 	MemSet(&hash_ctl, 0, sizeof(hash_ctl));
 	hash_ctl.keysize = sizeof(int);
 	hash_ctl.entrysize = sizeof(int);
-	hash_ctl.hash = uint32_hash;
 	deactivated_queries = hash_create("aqo_deactivated_queries",
 									  128,		/* start small and extend */
 									  &hash_ctl,
-									  HASH_ELEM | HASH_FUNCTION);
+									  HASH_ELEM | HASH_BLOBS);
 }
 
 /* Destroys the storage for hash of deactivated queries */