From b1860bb1cbcd7617e0e1d29b9678e47b1f27ba95 Mon Sep 17 00:00:00 2001 From: martianzhang Date: Wed, 16 Jan 2019 14:28:09 +0800 Subject: [PATCH] makefile color regression Makefile color code regression remove ParseDSN debug log --- Makefile | 8 ++++---- common/config.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b1e285d8..b461d60b 100644 --- a/Makefile +++ b/Makefile @@ -20,10 +20,10 @@ COMMIT_VERSION=`git rev-parse HEAD` # colors compatible setting COLOR_ENABLE=$(shell tput colors > /dev/null; echo $$?) ifeq "$(COLOR_ENABLE)" "0" -CRED=$(shell printf "\001\033[91m\002") -CGREEN=$(shell printf "\001\033[92m\002") -CYELLOW=$(shell printf "\001\033[93m\002") -CEND=$(shell printf "\001\033[0m\002") +CRED=$(shell printf "\033[91m") +CGREEN=$(shell printf "\033[92m") +CYELLOW=$(shell printf "\033[93m") +CEND=$(shell printf "\033[0m") endif # Add mysql version for testing `MYSQL_RELEASE=percona MYSQL_VERSION=5.7 make docker` diff --git a/common/config.go b/common/config.go index 786d150d..3e76e715 100644 --- a/common/config.go +++ b/common/config.go @@ -426,7 +426,7 @@ func parseDSN(odbc string, d *Dsn) *Dsn { func ParseDSN(odbc string, d *Dsn) *Dsn { cfg, err := mysql.ParseDSN(odbc) 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 newDSN(cfg)