1 files changed, 3 insertions, 61 deletions

diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index 4c309d236a3..a10014f755b 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -2146,16 +2146,6 @@ expression_tree_walker(Node *node,
 					return true;
 			}
 			break;
-		case T_MergeAction:
-			{
-				MergeAction *action = (MergeAction *) node;
-
-				if (walker(action->targetList, context))
-					return true;
-				if (walker(action->qual, context))
-					return true;
-			}
-			break;
 		case T_PartitionPruneStepOp:
 			{
 				PartitionPruneStepOp *opstep = (PartitionPruneStepOp *) node;
@@ -2276,10 +2266,6 @@ query_tree_walker(Query *query,
 		return true;
 	if (walker((Node *) query->onConflict, context))
 		return true;
-	if (walker((Node *) query->mergeSourceTargetList, context))
-		return true;
-	if (walker((Node *) query->mergeActionList, context))
-		return true;
 	if (walker((Node *) query->returningList, context))
 		return true;
 	if (walker((Node *) query->jointree, context))
@@ -2957,18 +2943,6 @@ expression_tree_mutator(Node *node,
 				return (Node *) newnode;
 			}
 			break;
-		case T_MergeAction:
-			{
-				MergeAction *action = (MergeAction *) node;
-				MergeAction *newnode;
-
-				FLATCOPY(newnode, action, MergeAction);
-				MUTATE(newnode->qual, action->qual, Node *);
-				MUTATE(newnode->targetList, action->targetList, List *);
-
-				return (Node *) newnode;
-			}
-			break;
 		case T_PartitionPruneStepOp:
 			{
 				PartitionPruneStepOp *opstep = (PartitionPruneStepOp *) node;
@@ -3134,8 +3108,6 @@ query_tree_mutator(Query *query,
 	MUTATE(query->targetList, query->targetList, List *);
 	MUTATE(query->withCheckOptions, query->withCheckOptions, List *);
 	MUTATE(query->onConflict, query->onConflict, OnConflictExpr *);
-	MUTATE(query->mergeSourceTargetList, query->mergeSourceTargetList, List *);
-	MUTATE(query->mergeActionList, query->mergeActionList, List *);
 	MUTATE(query->returningList, query->returningList, List *);
 	MUTATE(query->jointree, query->jointree, FromExpr *);
 	MUTATE(query->setOperations, query->setOperations, Node *);
@@ -3277,9 +3249,9 @@ query_or_expression_tree_mutator(Node *node,
  * boundaries: we descend to everything that's possibly interesting.
  *
  * Currently, the node type coverage here extends only to DML statements
- * (SELECT/INSERT/UPDATE/DELETE/MERGE) and nodes that can appear in them,
- * because this is used mainly during analysis of CTEs, and only DML
- * statements can appear in CTEs.
+ * (SELECT/INSERT/UPDATE/DELETE) and nodes that can appear in them, because
+ * this is used mainly during analysis of CTEs, and only DML statements can
+ * appear in CTEs.
  */
 bool
 raw_expression_tree_walker(Node *node,
@@ -3459,36 +3431,6 @@ raw_expression_tree_walker(Node *node,
 					return true;
 			}
 			break;
-		case T_MergeStmt:
-			{
-				MergeStmt  *stmt = (MergeStmt *) node;
-
-				if (walker(stmt->relation, context))
-					return true;
-				if (walker(stmt->source_relation, context))
-					return true;
-				if (walker(stmt->join_condition, context))
-					return true;
-				if (walker(stmt->mergeWhenClauses, context))
-					return true;
-				if (walker(stmt->withClause, context))
-					return true;
-			}
-			break;
-		case T_MergeWhenClause:
-			{
-				MergeWhenClause *mergeWhenClause = (MergeWhenClause *) node;
-
-				if (walker(mergeWhenClause->condition, context))
-					return true;
-				if (walker(mergeWhenClause->targetList, context))
-					return true;
-				if (walker(mergeWhenClause->cols, context))
-					return true;
-				if (walker(mergeWhenClause->values, context))
-					return true;
-			}
-			break;
 		case T_SelectStmt:
 			{
 				SelectStmt *stmt = (SelectStmt *) node;