session,parser: make MAX_EXECUTION_TIME sql hint and global variable …

…work update go.mod to use the latest parser which fix the sql hint for MAX_EXECUTION_TIME put max_execution_time into the auto load system variable list so it's correctly initialized Fix issue #10955
pingcap · Jun 27, 2019 · 7428f03 · 7428f03
1 parent cf5f42b
commit 7428f03
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/go.mod b/go.mod
@@ -43,7 +43,7 @@ require (
 	github.com/pingcap/goleveldb v0.0.0-20171020122428-b9ff6c35079e
 	github.com/pingcap/kvproto v0.0.0-20190619024611-a4759dfe3753
 	github.com/pingcap/log v0.0.0-20190307075452-bd41d9273596
-	github.com/pingcap/parser v0.0.0-20190613082312-d2cf6071823d
+	github.com/pingcap/parser v0.0.0-20190627064259-e9c42442aa72
 	github.com/pingcap/pd v0.0.0-20190617100349-293d4b5189bf
 	github.com/pingcap/tidb-tools v2.1.3-0.20190321065848-1e8b48f5c168+incompatible
 	github.com/pingcap/tipb v0.0.0-20190428032612-535e1abaa330

diff --git a/go.sum b/go.sum
@@ -168,6 +168,8 @@ github.com/pingcap/log v0.0.0-20190307075452-bd41d9273596 h1:t2OQTpPJnrPDGlvA+3F
 github.com/pingcap/log v0.0.0-20190307075452-bd41d9273596/go.mod h1:WpHUKhNZ18v116SvGrmjkA9CBhYmuUTKL+p8JC9ANEw=
 github.com/pingcap/parser v0.0.0-20190613082312-d2cf6071823d h1:JzkfOBJLcmtPJs+U5i0FUdN84wf4m0eNVB1c7EQcA9I=
 github.com/pingcap/parser v0.0.0-20190613082312-d2cf6071823d/go.mod h1:1FNvfp9+J0wvc4kl8eGNh7Rqrxveg15jJoWo/a0uHwA=
+github.com/pingcap/parser v0.0.0-20190627064259-e9c42442aa72 h1:yPYZB/rPuTost36QcoOLzvkDxVjqfJ9w0xTpohwlSlA=
+github.com/pingcap/parser v0.0.0-20190627064259-e9c42442aa72/go.mod h1:1FNvfp9+J0wvc4kl8eGNh7Rqrxveg15jJoWo/a0uHwA=
 github.com/pingcap/pd v0.0.0-20190617100349-293d4b5189bf h1:vmlN6DpZI5LtHd8r9YRAsyCeTU2pxRq+WlWn5CZ+ax4=
 github.com/pingcap/pd v0.0.0-20190617100349-293d4b5189bf/go.mod h1:3DlDlFT7EF64A1bmb/tulZb6wbPSagm5G4p1AlhaEDs=
 github.com/pingcap/tidb-tools v2.1.3-0.20190321065848-1e8b48f5c168+incompatible h1:MkWCxgZpJBgY2f4HtwWMMFzSBb3+JPzeJgF3VrXE/bU=

diff --git a/session/session.go b/session/session.go
@@ -1705,6 +1705,7 @@ var builtinGlobalVariable = []string{
 	variable.AutoIncrementIncrement,
 	variable.CollationServer,
 	variable.NetWriteTimeout,
+	variable.MaxExecutionTime,
 
 	/* TiDB specific global variables: */
 	variable.TiDBSkipUTF8Check,

diff --git a/session/session_test.go b/session/session_test.go
@@ -451,6 +451,12 @@ func (s *testSessionSuite) TestGlobalVarAccessor(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(v, Equals, varValue2)
 
+	// For issue 10955, make sure the new session load `max_execution_time` into sessionVars.
+	s.dom.GetGlobalVarsCache().Disable()
+	tk1.MustExec("set @@global.max_execution_time = 100")
+	tk2 := testkit.NewTestKitWithInit(c, s.store)
+	c.Assert(tk2.Se.GetSessionVars().MaxExecutionTime, Equals, uint64(100))
+
 	result := tk.MustQuery("show global variables  where variable_name='sql_select_limit';")
 	result.Check(testkit.Rows("sql_select_limit 18446744073709551615"))
 	result = tk.MustQuery("show session variables  where variable_name='sql_select_limit';")