diff --git a/executor/insert_test.go b/executor/insert_test.go index da9b2063a8816..21462654b9e85 100644 --- a/executor/insert_test.go +++ b/executor/insert_test.go @@ -343,6 +343,18 @@ func (s *testSuite3) TestUpdateDuplicateKey(c *C) { c.Assert(err.Error(), Equals, "[kv:1062]Duplicate entry '1-2-4' for key 'PRIMARY'") } +func (s *testSuite3) TestIssue37187(c *C) { + tk := testkit.NewTestKit(c, s.store) + tk.MustExec("use test") + + tk.MustExec("drop table if exists a, b") + tk.MustExec("create table t1 (a int(11) ,b varchar(100) ,primary key (a));") + tk.MustExec("create table t2 (c int(11) ,d varchar(100) ,primary key (c));") + tk.MustExec("prepare in1 from 'insert into t1 (a,b) select c,null from t2 t on duplicate key update b=t.d';") + err := tk.ExecToErr("execute in1;") + c.Assert(err, Equals, nil) +} + func (s *testSuite3) TestInsertWrongValueForField(c *C) { tk := testkit.NewTestKit(c, s.store) tk.MustExec("use test") diff --git a/planner/core/planbuilder.go b/planner/core/planbuilder.go index 3d54a4b433e79..095d19b58aa92 100644 --- a/planner/core/planbuilder.go +++ b/planner/core/planbuilder.go @@ -3155,6 +3155,11 @@ func (b *PlanBuilder) buildSelectPlanOfInsert(ctx context.Context, insert *ast.I } sel.Fields.Fields = append(sel.Fields.Fields, &ast.SelectField{Expr: colName, Offset: len(sel.Fields.Fields)}) } + defer func(originSelFieldLen int) { + // Revert the change for ast. Because when we use the 'prepare' and 'execute' statement it will both build plan which will cause problem. + // You can see the issue #37187 for more details. + sel.Fields.Fields = sel.Fields.Fields[:originSelFieldLen] + }(actualColLen) } } }