提交 a0b5adc7 编写于 作者: martianzhang's avatar martianzhang

Merge branch 'master' into dev

...@@ -20,10 +20,10 @@ COMMIT_VERSION=`git rev-parse HEAD` ...@@ -20,10 +20,10 @@ COMMIT_VERSION=`git rev-parse HEAD`
# colors compatible setting # colors compatible setting
COLOR_ENABLE=$(shell tput colors > /dev/null; echo $$?) COLOR_ENABLE=$(shell tput colors > /dev/null; echo $$?)
ifeq "$(COLOR_ENABLE)" "0" ifeq "$(COLOR_ENABLE)" "0"
CRED=$(shell echo "\033[91m") CRED=$(shell printf "\033[91m")
CGREEN=$(shell echo "\033[92m") CGREEN=$(shell printf "\033[92m")
CYELLOW=$(shell echo "\033[93m") CYELLOW=$(shell printf "\033[93m")
CEND=$(shell echo "\033[0m") CEND=$(shell printf "\033[0m")
endif endif
# Add mysql version for testing `MYSQL_RELEASE=percona MYSQL_VERSION=5.7 make docker` # Add mysql version for testing `MYSQL_RELEASE=percona MYSQL_VERSION=5.7 make docker`
......
...@@ -426,7 +426,7 @@ func parseDSN(odbc string, d *Dsn) *Dsn { ...@@ -426,7 +426,7 @@ func parseDSN(odbc string, d *Dsn) *Dsn {
func ParseDSN(odbc string, d *Dsn) *Dsn { func ParseDSN(odbc string, d *Dsn) *Dsn {
cfg, err := mysql.ParseDSN(odbc) cfg, err := mysql.ParseDSN(odbc)
if err != nil { if err != nil {
Log.Debug("go-sql-driver/mysql.ParseDSN Error: %s, DSN: %s, try to use old version parseDSN", err.Error(), odbc) // Log.Debug("go-sql-driver/mysql.ParseDSN Error: %s, DSN: %s, try to use old version parseDSN", err.Error(), odbc)
return parseDSN(odbc, d) return parseDSN(odbc, d)
} }
return newDSN(cfg) return newDSN(cfg)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册