Skip to content

Commit c2abf58

Browse files
author
James Cor
committed
fix
1 parent 4c06606 commit c2abf58

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

enginetest/queries/script_queries.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ FROM task_instance INNER JOIN job ON job.id = task_instance.queued_by_job_id INN
590590
{
591591
Query: "SELECT '123abc' in ('string', 1, 2, 123);",
592592
Expected: []sql.Row{{true}},
593-
ExpectedWarningsCount: 3, // MySQL only throws 1 warning
593+
ExpectedWarningsCount: 2, // MySQL only throws 1 warning
594594
ExpectedWarning: mysql.ERTruncatedWrongValue,
595595
ExpectedWarningMessageSubstring: "Truncated incorrect double value",
596596
},

sql/expression/in.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,7 @@ func (in *InTuple) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
169169
}
170170
cmp, cErr := cmpType.Compare(ctx, lv, rv)
171171
if cErr != nil {
172-
if !sql.ErrTruncatedIncorrect.Is(cErr) {
173-
return nil, cErr
174-
}
175-
ctx.Warn(mysql.ERTruncatedWrongValue, "%s", cErr.Error())
172+
return nil, cErr
176173
}
177174
if cmp == 0 {
178175
return true, nil

0 commit comments

Comments
 (0)