From 6421a405ee14a1f5c195dd2e04df76e130fd27cf Mon Sep 17 00:00:00 2001
From: HuaiyuXu <391585975@qq.com>
Date: Mon, 17 Sep 2018 17:17:01 +0800
Subject: [PATCH] tidb-server: set TiDBMemQuotaQuery to the value in
 configuration file (#7729)

---
 tidb-server/main.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tidb-server/main.go b/tidb-server/main.go
index 9a1bcc019200a..73a7768136de6 100644
--- a/tidb-server/main.go
+++ b/tidb-server/main.go
@@ -388,6 +388,9 @@ func setGlobalVars() {
 	plan.AllowCartesianProduct = cfg.Performance.CrossJoin
 	privileges.SkipWithGrant = cfg.Security.SkipGrantTable
 
+	variable.SysVars[variable.TIDBMemQuotaQuery].Value = strconv.FormatInt(cfg.MemQuotaQuery, 10)
+	variable.SysVars["lower_case_table_names"].Value = strconv.Itoa(cfg.LowerCaseTableNames)
+
 	plan.SetPreparedPlanCache(cfg.PreparedPlanCache.Enabled)
 	if plan.PreparedPlanCacheEnabled() {
 		plan.PreparedPlanCacheCapacity = cfg.PreparedPlanCache.Capacity
@@ -399,9 +402,6 @@ func setGlobalVars() {
 	tikv.GrpcKeepAliveTime = time.Duration(cfg.TiKVClient.GrpcKeepAliveTime) * time.Second
 	tikv.GrpcKeepAliveTimeout = time.Duration(cfg.TiKVClient.GrpcKeepAliveTimeout) * time.Second
 
-	// set lower_case_table_names
-	variable.SysVars["lower_case_table_names"].Value = strconv.Itoa(cfg.LowerCaseTableNames)
-
 	tikv.CommitMaxBackoff = int(parseDuration(cfg.TiKVClient.CommitTimeout).Seconds() * 1000)
 }