diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 06bb44b..4f069d1 100644
*** a/src/backend/executor/nodeHash.c
--- b/src/backend/executor/nodeHash.c
*************** ExecHashTableCreate(HashState *state, Li
*** 472,478 ****
  	 * Initialize the hash table control block.
  	 *
  	 * The hashtable control block is just palloc'd from the executor's
! 	 * per-query memory context.
  	 */
  	hashtable = (HashJoinTable) palloc(sizeof(HashJoinTableData));
  	hashtable->nbuckets = nbuckets;
--- 472,479 ----
  	 * Initialize the hash table control block.
  	 *
  	 * The hashtable control block is just palloc'd from the executor's
! 	 * per-query memory context.  Everything else should be kept inside the
! 	 * subsidiary hashCxt or batchCxt.
  	 */
  	hashtable = (HashJoinTable) palloc(sizeof(HashJoinTableData));
  	hashtable->nbuckets = nbuckets;
*************** ExecHashTableCreate(HashState *state, Li
*** 515,520 ****
--- 516,537 ----
  #endif
  
  	/*
+ 	 * Create temporary memory contexts in which to keep the hashtable working
+ 	 * storage.  See notes in executor/hashjoin.h.
+ 	 */
+ 	hashtable->hashCxt = AllocSetContextCreate(CurrentMemoryContext,
+ 											   "HashTableContext",
+ 											   ALLOCSET_DEFAULT_SIZES);
+ 
+ 	hashtable->batchCxt = AllocSetContextCreate(hashtable->hashCxt,
+ 												"HashBatchContext",
+ 												ALLOCSET_DEFAULT_SIZES);
+ 
+ 	/* Allocate data that will live for the life of the hashjoin */
+ 
+ 	oldcxt = MemoryContextSwitchTo(hashtable->hashCxt);
+ 
+ 	/*
  	 * Get info about the hash functions to be used for each hash key. Also
  	 * remember whether the join operators are strict.
  	 */
*************** ExecHashTableCreate(HashState *state, Li
*** 540,561 ****
  		i++;
  	}
  
- 	/*
- 	 * Create temporary memory contexts in which to keep the hashtable working
- 	 * storage.  See notes in executor/hashjoin.h.
- 	 */
- 	hashtable->hashCxt = AllocSetContextCreate(CurrentMemoryContext,
- 											   "HashTableContext",
- 											   ALLOCSET_DEFAULT_SIZES);
- 
- 	hashtable->batchCxt = AllocSetContextCreate(hashtable->hashCxt,
- 												"HashBatchContext",
- 												ALLOCSET_DEFAULT_SIZES);
- 
- 	/* Allocate data that will live for the life of the hashjoin */
- 
- 	oldcxt = MemoryContextSwitchTo(hashtable->hashCxt);
- 
  	if (nbatch > 1 && hashtable->parallel_state == NULL)
  	{
  		/*
--- 557,562 ----