resolve conflict

go.mod

@@ -75,3 +75,5 @@ require (
 )
 
 go 1.13
+
+replace github.com/pingcap/parser => github.com/lysu/parser v0.0.0-20200317052955-b3c497862c01

go.sum

@@ -115,6 +115,8 @@ github.com/kr/pty v1.0.0/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/lysu/parser v0.0.0-20200317052955-b3c497862c01 h1:tGHARlSP+UzzFTkbxrzQeH39SXfDVf3ecyJqu/9s8cE=
+github.com/lysu/parser v0.0.0-20200317052955-b3c497862c01/go.mod h1:CJk6LPzPxAcwHIcTugQaKxzvTR10NDJ5ln8XR7uYTJk=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=

server/server.go

@@ -32,6 +32,7 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
+	"github.com/pingcap/tidb/errno"
 	"io"
 	"math/rand"
 	"net"
@@ -83,23 +84,14 @@ func init() {
 }
 
 var (
-<<<<<<< HEAD
-	errUnknownFieldType    = terror.ClassServer.New(codeUnknownFieldType, "unknown field type")
-	errInvalidPayloadLen   = terror.ClassServer.New(codeInvalidPayloadLen, "invalid payload length")
-	errInvalidSequence     = terror.ClassServer.New(codeInvalidSequence, "invalid sequence")
-	errInvalidType         = terror.ClassServer.New(codeInvalidType, "invalid type")
-	errNotAllowedCommand   = terror.ClassServer.New(codeNotAllowedCommand, "the used command is not allowed with this TiDB version")
-	errAccessDenied        = terror.ClassServer.New(codeAccessDenied, mysql.MySQLErrName[mysql.ErrAccessDenied])
-	errMaxExecTimeExceeded = terror.ClassServer.New(codeMaxExecTimeExceeded, mysql.MySQLErrName[mysql.ErrMaxExecTimeExceeded])
-=======
-	errUnknownFieldType        = terror.ClassServer.New(errno.ErrUnknownFieldType, errno.MySQLErrName[errno.ErrUnknownFieldType])
-	errInvalidSequence         = terror.ClassServer.New(errno.ErrInvalidSequence, errno.MySQLErrName[errno.ErrInvalidSequence])
-	errInvalidType             = terror.ClassServer.New(errno.ErrInvalidType, errno.MySQLErrName[errno.ErrInvalidType])
-	errNotAllowedCommand       = terror.ClassServer.New(errno.ErrNotAllowedCommand, errno.MySQLErrName[errno.ErrNotAllowedCommand])
-	errAccessDenied            = terror.ClassServer.New(errno.ErrAccessDenied, errno.MySQLErrName[errno.ErrAccessDenied])
-	errConCount                = terror.ClassServer.New(errno.ErrConCount, errno.MySQLErrName[errno.ErrConCount])
-	errSecureTransportRequired = terror.ClassServer.New(errno.ErrSecureTransportRequired, errno.MySQLErrName[errno.ErrSecureTransportRequired])
->>>>>>> aec6143... *: support require-secure-transport startup option (#15341)
+	errUnknownFieldType        = terror.ClassServer.New(codeUnknownFieldType, "unknown field type")
+	errInvalidPayloadLen       = terror.ClassServer.New(codeInvalidPayloadLen, "invalid payload length")
+	errInvalidSequence         = terror.ClassServer.New(codeInvalidSequence, "invalid sequence")
+	errInvalidType             = terror.ClassServer.New(codeInvalidType, "invalid type")
+	errNotAllowedCommand       = terror.ClassServer.New(codeNotAllowedCommand, "the used command is not allowed with this TiDB version")
+	errAccessDenied            = terror.ClassServer.New(codeAccessDenied, mysql.MySQLErrName[mysql.ErrAccessDenied])
+	errMaxExecTimeExceeded     = terror.ClassServer.New(codeMaxExecTimeExceeded, mysql.MySQLErrName[mysql.ErrMaxExecTimeExceeded])
+	errSecureTransportRequired = terror.ClassServer.New(codeSecureTransportRequired, errno.MySQLErrName[mysql.ErrSecureTransportRequired])
 )
 
 // DefaultCapability is the capability of the server when it is created using the default configuration.
@@ -209,22 +201,14 @@ func NewServer(cfg *config.Config, driver IDriver) (*Server, error) {
 
 	tlsConfig, err := util.LoadTLSCertificates(s.cfg.Security.SSLCA, s.cfg.Security.SSLKey, s.cfg.Security.SSLCert)
 	if err != nil {
-<<<<<<< HEAD
 		logutil.Logger(context.Background()).Error("secure connection cert/key/ca load fail", zap.Error(err))
-=======
-		logutil.BgLogger().Error("secure connection cert/key/ca load fail", zap.Error(err))
->>>>>>> aec6143... *: support require-secure-transport startup option (#15341)
 	}
 	if tlsConfig != nil {
 		setSSLVariable(s.cfg.Security.SSLCA, s.cfg.Security.SSLKey, s.cfg.Security.SSLCert)
 		atomic.StorePointer(&s.tlsConfig, unsafe.Pointer(tlsConfig))
-<<<<<<< HEAD
 		logutil.Logger(context.Background()).Info("mysql protocol server secure connection is enabled", zap.Bool("client verification enabled", len(variable.SysVars["ssl_ca"].Value) > 0))
-=======
-		logutil.BgLogger().Info("mysql protocol server secure connection is enabled", zap.Bool("client verification enabled", len(variable.SysVars["ssl_ca"].Value) > 0))
 	} else if cfg.Security.RequireSecureTransport {
 		return nil, errSecureTransportRequired.FastGenByArgs()
->>>>>>> aec6143... *: support require-secure-transport startup option (#15341)
 	}
 
 	setSystemTimeZoneVariable()
@@ -615,16 +599,18 @@ const (
 	codeInvalidSequence   = 3
 	codeInvalidType       = 4
 
-	codeNotAllowedCommand   = 1148
-	codeAccessDenied        = mysql.ErrAccessDenied
-	codeMaxExecTimeExceeded = mysql.ErrMaxExecTimeExceeded
+	codeNotAllowedCommand       = 1148
+	codeAccessDenied            = mysql.ErrAccessDenied
+	codeMaxExecTimeExceeded     = mysql.ErrMaxExecTimeExceeded
+	codeSecureTransportRequired = mysql.ErrSecureTransportRequired
 )
 
 func init() {
 	serverMySQLErrCodes := map[terror.ErrCode]uint16{
-		codeNotAllowedCommand:   mysql.ErrNotAllowedCommand,
-		codeAccessDenied:        mysql.ErrAccessDenied,
-		codeMaxExecTimeExceeded: mysql.ErrMaxExecTimeExceeded,
+		codeNotAllowedCommand:       mysql.ErrNotAllowedCommand,
+		codeAccessDenied:            mysql.ErrAccessDenied,
+		codeMaxExecTimeExceeded:     mysql.ErrMaxExecTimeExceeded,
+		codeSecureTransportRequired: mysql.ErrSecureTransportRequired,
 	}
 	terror.ErrClassToMySQLCodes[terror.ClassServer] = serverMySQLErrCodes
 }

server/tidb_test.go

@@ -609,8 +609,6 @@ func (ts *TidbTestSuite) TestErrorNoRollback(c *C) {
 	cfg.Port = 4006
 	cfg.Status.ReportStatus = false
 
-<<<<<<< HEAD
-=======
 	cfg.Security = config.Security{
 		RequireSecureTransport: true,
 		SSLCA:                  "wrong path",
@@ -620,7 +618,6 @@ func (ts *TidbTestSuite) TestErrorNoRollback(c *C) {
 	_, err = NewServer(cfg, ts.tidbdrv)
 	c.Assert(err, NotNil)
 
->>>>>>> aec6143... *: support require-secure-transport startup option (#15341)
 	// test reload tls fail with/without "error no rollback option"
 	cfg.Security = config.Security{
 		SSLCA:   "/tmp/ca-cert-rollback.pem",

tidb-server/main.go

@@ -63,33 +63,6 @@ import (
 
 // Flag Names
 const (
-<<<<<<< HEAD
-	nmVersion          = "V"
-	nmConfig           = "config"
-	nmConfigCheck      = "config-check"
-	nmConfigStrict     = "config-strict"
-	nmStore            = "store"
-	nmStorePath        = "path"
-	nmHost             = "host"
-	nmAdvertiseAddress = "advertise-address"
-	nmPort             = "P"
-	nmCors             = "cors"
-	nmSocket           = "socket"
-	nmEnableBinlog     = "enable-binlog"
-	nmRunDDL           = "run-ddl"
-	nmLogLevel         = "L"
-	nmLogFile          = "log-file"
-	nmLogSlowQuery     = "log-slow-query"
-	nmReportStatus     = "report-status"
-	nmStatusHost       = "status-host"
-	nmStatusPort       = "status"
-	nmMetricsAddr      = "metrics-addr"
-	nmMetricsInterval  = "metrics-interval"
-	nmDdlLease         = "lease"
-	nmTokenLimit       = "token-limit"
-	nmPluginDir        = "plugin-dir"
-	nmPluginLoad       = "plugin-load"
-=======
 	nmVersion                = "V"
 	nmConfig                 = "config"
 	nmConfigCheck            = "config-check"
@@ -115,10 +88,7 @@ const (
 	nmTokenLimit             = "token-limit"
 	nmPluginDir              = "plugin-dir"
 	nmPluginLoad             = "plugin-load"
-	nmRepairMode             = "repair-mode"
-	nmRepairList             = "repair-list"
 	nmRequireSecureTransport = "require-secure-transport"
->>>>>>> aec6143... *: support require-secure-transport startup option (#15341)
 
 	nmProxyProtocolNetworks      = "proxy-protocol-networks"
 	nmProxyProtocolHeaderTimeout = "proxy-protocol-header-timeout"
@@ -144,13 +114,7 @@ var (
 	tokenLimit       = flag.Int(nmTokenLimit, 1000, "the limit of concurrent executed sessions")
 	pluginDir        = flag.String(nmPluginDir, "/data/deploy/plugin", "the folder that hold plugin")
 	pluginLoad       = flag.String(nmPluginLoad, "", "wait load plugin name(separated by comma)")
-<<<<<<< HEAD
-=======
-	affinityCPU      = flag.String(nmAffinityCPU, "", "affinity cpu (cpu-no. separated by comma, e.g. 1,2,3)")
-	repairMode       = flagBoolean(nmRepairMode, false, "enable admin repair mode")
-	repairList       = flag.String(nmRepairList, "", "admin repair table list")
 	requireTLS       = flag.Bool(nmRequireSecureTransport, false, "require client use secure transport")
->>>>>>> aec6143... *: support require-secure-transport startup option (#15341)
 
 	// Log
 	logLevel     = flag.String(nmLogLevel, "info", "log level: info, debug, warn, error, fatal")
@@ -477,21 +441,9 @@ func overrideConfig() {
 	if actualFlags[nmPluginDir] {
 		cfg.Plugin.Dir = *pluginDir
 	}
-<<<<<<< HEAD
-=======
 	if actualFlags[nmRequireSecureTransport] {
 		cfg.Security.RequireSecureTransport = *requireTLS
 	}
-	if actualFlags[nmRepairMode] {
-		cfg.RepairMode = *repairMode
-	}
-	if actualFlags[nmRepairList] {
-		if cfg.RepairMode {
-			cfg.RepairTableList = stringToList(*repairList)
-		}
-	}
->>>>>>> aec6143... *: support require-secure-transport startup option (#15341)
-
 	// Log
 	if actualFlags[nmLogLevel] {
 		cfg.Log.Level = *logLevel

util/misc.go

@@ -30,6 +30,7 @@ import (
 	"github.com/pingcap/parser/model"
 	"github.com/pingcap/parser/mysql"
 	"github.com/pingcap/parser/terror"
+	"github.com/pingcap/tidb/config"
 	"github.com/pingcap/tidb/util/logutil"
 	"go.uber.org/zap"
 )