Skip to content

Commit 1388ea8

Browse files
authored
executor, table: fix potential data race (pingcap#55737) (pingcap#55739)
close pingcap#43118
1 parent b28c84d commit 1388ea8

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

executor/mem_reader.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -801,11 +801,7 @@ func getColIDAndPkColIDs(ctx sessionctx.Context, tbl table.Table, columns []*mod
801801
pkColIDs = []int64{-1}
802802
}
803803
defVal := func(i int) ([]byte, error) {
804-
sessVars := ctx.GetSessionVars()
805-
originStrict := sessVars.StrictSQLMode
806-
sessVars.StrictSQLMode = false
807-
d, err := table.GetColOriginDefaultValue(ctx, columns[i])
808-
sessVars.StrictSQLMode = originStrict
804+
d, err := table.GetColOriginDefaultValueWithoutStrictSQLMode(ctx, columns[i])
809805
if err != nil {
810806
return nil, err
811807
}

table/tables/tables.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2266,16 +2266,12 @@ func SetPBColumnsDefaultValue(ctx sessionctx.Context, pbColumns []*tipb.ColumnIn
22662266
continue
22672267
}
22682268

2269-
sessVars := ctx.GetSessionVars()
2270-
originStrict := sessVars.StrictSQLMode
2271-
sessVars.StrictSQLMode = false
2272-
d, err := table.GetColOriginDefaultValue(ctx, c)
2273-
sessVars.StrictSQLMode = originStrict
2269+
d, err := table.GetColOriginDefaultValueWithoutStrictSQLMode(ctx, c)
22742270
if err != nil {
22752271
return err
22762272
}
22772273

2278-
pbColumns[i].DefaultVal, err = tablecodec.EncodeValue(sessVars.StmtCtx, nil, d)
2274+
pbColumns[i].DefaultVal, err = tablecodec.EncodeValue(ctx.GetSessionVars().StmtCtx, nil, d)
22792275
if err != nil {
22802276
return err
22812277
}

0 commit comments

Comments
 (0)