Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding line number and connect string to log.Fatalf for addConnection #51

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Adding line number and connect string to log.Fatalf for addConnection #51

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1519afc
Adding line number and connect string to log.Fatalf for addConnection
mjonss Jan 14, 2022
1289694
Merge remote-tracking branch 'pingcap/master' into con-failed-log
mjonss Nov 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,10 @@ func isTiDB(db *sql.DB) bool {
return true
}

func (t *tester) addConnection(connName, hostName, userName, password, db string) {
func (t *tester) addConnection(q query, connName, hostName, userName, password, db string) {
mdb, err := OpenDBWithRetry("mysql", userName+":"+password+"@tcp("+hostName+":"+port+")/"+db+"?time_zone=%27Asia%2FShanghai%27"+params)
if err != nil {
log.Fatalf("Open db err %v", err)
log.Fatalf("addConnection line: %d connect(%s) Open db err %v", q.Line, q.Query, err)
}
if isTiDB(mdb) {
if _, err = mdb.Exec("SET @@tidb_init_chunk_size=1"); err != nil {
Expand Down Expand Up @@ -351,7 +351,7 @@ func (t *tester) Run() error {
for i := 0; i < 4; i++ {
args = append(args, "")
}
t.addConnection(args[0], args[1], args[2], args[3], args[4])
t.addConnection(q, args[0], args[1], args[2], args[3], args[4])
case Q_CONNECTION:
q.Query = strings.TrimSpace(q.Query)
if q.Query[len(q.Query)-1] == ';' {
Expand Down