fix ci

pingcap · Jul 9, 2019 · 06f948d · 06f948d
1 parent f3b34da
commit 06f948d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/expression/builtin_string.go b/expression/builtin_string.go
@@ -368,6 +368,7 @@ type builtinConcatWSSig struct {
 func (b *builtinConcatWSSig) Clone() builtinFunc {
 	newSig := &builtinConcatWSSig{}
 	newSig.cloneFrom(&b.baseBuiltinFunc)
+	newSig.maxAllowedPacket = b.maxAllowedPacket
 	return newSig
 }
 

diff --git a/expression/integration_test.go b/expression/integration_test.go
@@ -556,6 +556,7 @@ func (s *testIntegrationSuite) TestMathBuiltin(c *C) {
 }
 
 func (s *testIntegrationSuite) TestStringBuiltin(c *C) {
+	s.ctx.GetSessionVars().SetSystemVar(variable.MaxAllowedPacket, "67108864")
 	defer s.cleanEnv(c)
 	tk := testkit.NewTestKit(c, s.store)
 	tk.MustExec("use test")

diff --git a/planner/core/exhaust_physical_plans_test.go b/planner/core/exhaust_physical_plans_test.go
@@ -21,6 +21,7 @@ import (
 	"github.com/pingcap/parser/model"
 	"github.com/pingcap/parser/mysql"
 	"github.com/pingcap/tidb/expression"
+	"github.com/pingcap/tidb/sessionctx/variable"
 	"github.com/pingcap/tidb/types"
 )
 
@@ -40,6 +41,7 @@ func (s *testUnitTestSuit) rewriteSimpleExpr(str string, schema *expression.Sche
 
 func (s *testUnitTestSuit) TestIndexJoinAnalyzeLookUpFilters(c *C) {
 	s.ctx.GetSessionVars().PlanID = -1
+	s.ctx.GetSessionVars().SetSystemVar(variable.MaxAllowedPacket, "67108864")
 	joinNode := LogicalJoin{}.Init(s.ctx)
 	dataSourceNode := DataSource{}.Init(s.ctx)
 	dsSchema := expression.NewSchema()

diff --git a/planner/core/logical_plan_test.go b/planner/core/logical_plan_test.go
@@ -29,6 +29,7 @@ import (
 	"github.com/pingcap/tidb/infoschema"
 	"github.com/pingcap/tidb/planner/property"
 	"github.com/pingcap/tidb/sessionctx"
+	"github.com/pingcap/tidb/sessionctx/variable"
 	"github.com/pingcap/tidb/util/testleak"
 )
 
@@ -1360,6 +1361,7 @@ func (s *testPlanSuite) TestValidate(c *C) {
 			err: ErrUnknownColumn,
 		},
 	}
+	s.ctx.GetSessionVars().SetSystemVar(variable.MaxAllowedPacket, "67108864")
 	for _, tt := range tests {
 		sql := tt.sql
 		comment := Commentf("for %s", sql)