This is an automated cherry-pick of pingcap#53108

Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot · May 14, 2024 · 5b1e5dc · 5b1e5dc
1 parent 335e834
commit 5b1e5dc
Show file tree

Hide file tree

Showing 3 changed files with 910 additions and 1 deletion.
diff --git a/planner/core/logical_plan_builder.go b/planner/core/logical_plan_builder.go
@@ -5940,7 +5940,7 @@ func (b *PlanBuilder) buildUpdateLists(ctx context.Context, tableList []*ast.Tab
 			if expr := extractDefaultExpr(assign.Expr); expr != nil {
 				expr.Name = assign.Column
 			}
-			newExpr, np, err = b.rewrite(ctx, assign.Expr, p, nil, false)
+			newExpr, np, err = b.rewrite(ctx, assign.Expr, p, nil, true)
 			if err != nil {
 				return nil, nil, false, err
 			}
@@ -5962,7 +5962,14 @@ func (b *PlanBuilder) buildUpdateLists(ctx context.Context, tableList []*ast.Tab
 				}
 			}
 
+<<<<<<< HEAD:planner/core/logical_plan_builder.go
 			newExpr, np, err = b.rewriteWithPreprocess(ctx, assign.Expr, p, nil, nil, false, rewritePreprocess(assign))
+=======
+			o := b.allowBuildCastArray
+			b.allowBuildCastArray = true
+			newExpr, np, err = b.rewriteWithPreprocess(ctx, assign.Expr, p, nil, nil, true, rewritePreprocess(assign))
+			b.allowBuildCastArray = o
+>>>>>>> 97d47052e0c (planner: resolve panic when the update lists contain complex subquery (#53108)):pkg/planner/core/logical_plan_builder.go
 			if err != nil {
 				return nil, nil, false, err
 			}