Added hostname sysvar, fixes #7740 (#7750)

pingcap · Sep 20, 2018 · 8a1847e · 8a1847e
1 parent 268ace8
commit 8a1847e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/sessionctx/variable/sysvar.go b/sessionctx/variable/sysvar.go
@@ -287,7 +287,7 @@ var defaultSysVars = []*SysVar{
 	{ScopeGlobal, "thread_cache_size", "9"},
 	{ScopeGlobal, "log_slow_admin_statements", "OFF"},
 	{ScopeNone, "innodb_checksums", "ON"},
-	{ScopeNone, "hostname", "localhost"},
+	{ScopeNone, "hostname", ServerHostname},
 	{ScopeGlobal | ScopeSession, "auto_increment_offset", "1"},
 	{ScopeNone, "ft_stopword_file", "(built-in)"},
 	{ScopeGlobal, "innodb_max_dirty_pages_pct_lwm", "0"},

diff --git a/sessionctx/variable/tidb_vars.go b/sessionctx/variable/tidb_vars.go
@@ -13,6 +13,10 @@
 
 package variable
 
+import (
+	"os"
+)
+
 /*
 	Steps to add a new TiDB specific system variable:
 
@@ -229,4 +233,5 @@ var (
 	maxDDLReorgWorkerCount int32 = 128
 	// DDLSlowOprThreshold is the threshold for ddl slow operations, uint is millisecond.
 	DDLSlowOprThreshold uint32 = 300
+	ServerHostname, _          = os.Hostname()
 )