expression: deep copy the string when setting user variable fr… (#11044)

pingcap · Jul 9, 2019 · a5a0596 · a5a0596
1 parent 73c34e1
commit a5a0596
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/expression/builtin_other.go b/expression/builtin_other.go
@@ -22,6 +22,7 @@ import (
 	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/types/json"
 	"github.com/pingcap/tidb/util/chunk"
+	"github.com/pingcap/tidb/util/stringutil"
 	"github.com/pingcap/tipb/go-tipb"
 )
 
@@ -420,7 +421,7 @@ func (b *builtinSetVarSig) evalString(row chunk.Row) (res string, isNull bool, e
 	}
 	varName = strings.ToLower(varName)
 	sessionVars.UsersLock.Lock()
-	sessionVars.Users[varName] = res
+	sessionVars.Users[varName] = stringutil.Copy(res)
 	sessionVars.UsersLock.Unlock()
 	return res, false, nil
 }

diff --git a/expression/builtin_other_test.go b/expression/builtin_other_test.go
@@ -234,3 +234,46 @@ func (s *testEvaluatorSuite) TestValues(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(cmp, Equals, 0)
 }
+
+func (s *testEvaluatorSuite) TestSetVarFromColumn(c *C) {
+	defer testleak.AfterTest(c)()
+
+	// Construct arguments.
+	argVarName := &Constant{
+		Value:   types.NewStringDatum("a"),
+		RetType: &types.FieldType{Tp: mysql.TypeVarString, Flen: 20},
+	}
+	argCol := &Column{
+		RetType: &types.FieldType{Tp: mysql.TypeVarString, Flen: 20},
+		Index:   0,
+	}
+
+	// Construct SetVar function.
+	funcSetVar, err := NewFunction(
+		s.ctx,
+		ast.SetVar,
+		&types.FieldType{Tp: mysql.TypeVarString, Flen: 20},
+		[]Expression{argVarName, argCol}...,
+	)
+	c.Assert(err, IsNil)
+
+	// Construct input and output Chunks.
+	inputChunk := chunk.NewChunkWithCapacity([]*types.FieldType{argCol.RetType}, 1)
+	inputChunk.AppendString(0, "a")
+	outputChunk := chunk.NewChunkWithCapacity([]*types.FieldType{argCol.RetType}, 1)
+
+	// Evaluate the SetVar function.
+	err = evalOneCell(s.ctx, funcSetVar, inputChunk.GetRow(0), outputChunk, 0)
+	c.Assert(err, IsNil)
+	c.Assert(outputChunk.GetRow(0).GetString(0), Equals, "a")
+
+	// Change the content of the underlying Chunk.
+	inputChunk.Reset()
+	inputChunk.AppendString(0, "b")
+
+	// Check whether the user variable changed.
+	sessionVars := s.ctx.GetSessionVars()
+	sessionVars.UsersLock.RLock()
+	defer sessionVars.UsersLock.RUnlock()
+	c.Assert(sessionVars.Users["a"], Equals, "a")
+}