MM-18636: fix wrong merge conflict (#12386)
I resolved a merge conflict incorrectly when submitting MM-18636, and want to remove the unused code I left behind.
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
e5ba0a0a18
Коммит
841099194d
@@ -7,7 +7,6 @@ import (
|
|||||||
"bytes"
|
"bytes"
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"regexp"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/jmoiron/sqlx"
|
"github.com/jmoiron/sqlx"
|
||||||
@@ -28,8 +27,6 @@ import (
|
|||||||
// It is imposed by MySQL's default max_allowed_packet value of 4Mb.
|
// It is imposed by MySQL's default max_allowed_packet value of 4Mb.
|
||||||
const MaxWriteLength = 4 * 1024 * 1024
|
const MaxWriteLength = 4 * 1024 * 1024
|
||||||
|
|
||||||
var tcpStripper = regexp.MustCompile(`@tcp\((.*)\)`)
|
|
||||||
|
|
||||||
// DatabaseStore is a config store backed by a database.
|
// DatabaseStore is a config store backed by a database.
|
||||||
type DatabaseStore struct {
|
type DatabaseStore struct {
|
||||||
commonStore
|
commonStore
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user