Skip to content

Commit d68b02b

Browse files
committed
Remove master-info-file
1 parent cc60d64 commit d68b02b

File tree

5 files changed

+0
-16
lines changed

5 files changed

+0
-16
lines changed

go/flags/endtoend/vttablet.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ Usage of vttablet:
177177
--mycnf_general_log_path string mysql general log path
178178
--mycnf_innodb_data_home_dir string Innodb data home directory
179179
--mycnf_innodb_log_group_home_dir string Innodb log group home directory
180-
--mycnf_master_info_file string mysql master.info file
181180
--mycnf_mysql_port int port mysql is listening on
182181
--mycnf_pid_file string mysql pid file
183182
--mycnf_relay_log_index_path string mysql relay log index path

go/vt/mysqlctl/mycnf.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,6 @@ type Mycnf struct {
9292
// (used by vt software for binlog streaming)
9393
BinLogPath string
9494

95-
// MasterInfoFile is the master.info file location.
96-
// Unused when vitess manages mysql config because we set
97-
// master_info_repository = TABLE and
98-
// relay_log_info_repository = TABLE
99-
// However it is possible to use custom cnf files with vitess
100-
// and to generate them using command-line flags, so we allow a way to set this property
101-
MasterInfoFile string
102-
10395
// PidFile is the mysql.pid file location
10496
// (used by vt software to check server is running)
10597
PidFile string
@@ -208,7 +200,6 @@ func ReadMycnf(mycnf *Mycnf) (*Mycnf, error) {
208200
"relay-log-index": &mycnf.RelayLogIndexPath,
209201
"relay-log-info-file": &mycnf.RelayLogInfoPath,
210202
"log-bin": &mycnf.BinLogPath,
211-
"master-info-file": &mycnf.MasterInfoFile,
212203
"pid-file": &mycnf.PidFile,
213204
"tmpdir": &mycnf.TmpDir,
214205
"secure-file-priv": &mycnf.SecureFilePriv,

go/vt/mysqlctl/mycnf_flag.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ var (
4242
flagRelayLogIndexPath string
4343
flagRelayLogInfoPath string
4444
flagBinLogPath string
45-
flagMasterInfoFile string
4645
flagPidFile string
4746
flagTmpDir string
4847
flagSecureFilePriv string
@@ -69,7 +68,6 @@ func RegisterFlags() {
6968
fs.StringVar(&flagRelayLogIndexPath, "mycnf_relay_log_index_path", flagRelayLogIndexPath, "mysql relay log index path")
7069
fs.StringVar(&flagRelayLogInfoPath, "mycnf_relay_log_info_path", flagRelayLogInfoPath, "mysql relay log info path")
7170
fs.StringVar(&flagBinLogPath, "mycnf_bin_log_path", flagBinLogPath, "mysql binlog path")
72-
fs.StringVar(&flagMasterInfoFile, "mycnf_master_info_file", flagMasterInfoFile, "mysql master.info file")
7371
fs.StringVar(&flagPidFile, "mycnf_pid_file", flagPidFile, "mysql pid file")
7472
fs.StringVar(&flagTmpDir, "mycnf_tmp_dir", flagTmpDir, "mysql tmp directory")
7573
fs.StringVar(&flagSecureFilePriv, "mycnf_secure_file_priv", flagSecureFilePriv, "mysql path for loading secure files")
@@ -109,7 +107,6 @@ func NewMycnfFromFlags(uid uint32) (mycnf *Mycnf, err error) {
109107
RelayLogIndexPath: flagRelayLogIndexPath,
110108
RelayLogInfoPath: flagRelayLogInfoPath,
111109
BinLogPath: flagBinLogPath,
112-
MasterInfoFile: flagMasterInfoFile,
113110
PidFile: flagPidFile,
114111
TmpDir: flagTmpDir,
115112
SecureFilePriv: flagSecureFilePriv,

go/vt/mysqlctl/mycnf_gen.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ func NewMycnf(tabletUID uint32, mysqlPort int32) *Mycnf {
9292
cnf.RelayLogInfoPath = path.Join(tabletDir, relayLogDir, "relay-log.info")
9393
cnf.BinLogPath = path.Join(tabletDir, binLogDir,
9494
fmt.Sprintf("vt-%010d-bin", tabletUID))
95-
cnf.MasterInfoFile = path.Join(tabletDir, "master.info")
9695
cnf.PidFile = path.Join(tabletDir, "mysql.pid")
9796
cnf.TmpDir = path.Join(tabletDir, "tmp")
9897
// by default the secure-file-priv path is `tmp`

go/vt/sysvars/sysvars.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ var (
161161
{Name: "sql_log_off"},
162162
{Name: "thread_pool_high_priority_connection"},
163163
{Name: "thread_pool_prio_kickup_timer"},
164-
{Name: "transaction_write_set_extraction"},
165164
}
166165
UseReservedConn = []SystemVariable{
167166
{Name: "default_week_format"},
@@ -195,7 +194,6 @@ var (
195194
{Name: "read_buffer_size", SupportSetVar: true},
196195
{Name: "read_rnd_buffer_size", SupportSetVar: true},
197196
{Name: "show_create_table_verbosity", IsBoolean: true},
198-
{Name: "show_old_temporals", IsBoolean: true},
199197
{Name: "sort_buffer_size", SupportSetVar: true},
200198
{Name: "sql_big_selects", IsBoolean: true, SupportSetVar: true},
201199
{Name: "sql_mode", SupportSetVar: true},

0 commit comments

Comments
 (0)