summaryrefslogtreecommitdiff
path: root/src/backend/optimizer/path/allpaths.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/optimizer/path/allpaths.c')
-rw-r--r--src/backend/optimizer/path/allpaths.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 7ed03b33a7..8fbf110b13 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -3374,7 +3374,11 @@ make_rel_from_joinlist(PlannerInfo *root, List *joinlist)
if (enable_hashjoin)
jsa_mask |= JSA_HASHJOIN;
if (enable_mergejoin)
- jsa_mask |= JSA_MERGEJOIN;
+ {
+ jsa_mask |= JSA_MERGEJOIN_PLAIN;
+ if (enable_material)
+ jsa_mask |= JSA_MERGEJOIN_MATERIALIZE;
+ }
if (enable_nestloop)
{
jsa_mask |= JSA_NESTLOOP_PLAIN;