Merge branch 'master' of github.com:grafana/grafana

2017-08-24 11:18:44 +02:00
parent 71c22fdbff 632a5e9b97
commit 47f8145246
5 changed files with 32 additions and 13 deletions
@@ -114,7 +114,7 @@ func getEngine() (*xorm.Engine, error) {
 			protocol = "unix"
 		}

-		cnnstr = fmt.Sprintf("%s:%s@%s(%s)/%s?charset=utf8mb4",
+		cnnstr = fmt.Sprintf("%s:%s@%s(%s)/%s?charset=utf8mb4&allowNativePasswords=true",
 			DbCfg.User, DbCfg.Pwd, protocol, DbCfg.Host, DbCfg.Name)

 		if DbCfg.SslMode == "true" || DbCfg.SslMode == "skip-verify" {