diff options
| author | Daniel Black <daniel@mariadb.org> | 2021-05-19 18:09:49 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2021-05-20 07:55:55 +1000 |
| commit | 406ce57232aac5c65bf0591078f36c4c56b19c95 (patch) | |
| tree | 5e2a67b973ed3888782153319caeae002ccfff63 /sql/mysqld.cc | |
| parent | e570f740cdabb1774683203ee848d522c6588dbc (diff) | |
| download | mariadb-git-406ce57232aac5c65bf0591078f36c4c56b19c95.tar.gz | |
MDEV-25728: mysqld --help --verbose creates a log-bin-index file
before change test:
strace -fe trace=file -o /tmp/f.strace sql/mysqld --datadir=/tmp/d --log-bin=foo-bin --help --verbose && ls -la /tmp/
...
'mysqladmin variables' instead of 'mysqld --verbose --help'.
total 0
drwxrwxr-x. 2 dan dan 60 May 19 18:05 .
drwxrwxrwt. 27 root root 640 May 19 18:03 ..
-rw-rw----. 1 dan dan 0 May 19 18:05 foo-bin.index
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 48121ce2ea2..9afc701c6ba 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5324,7 +5324,7 @@ static int init_server_components() } } - if (opt_bin_log) + if (!opt_help && opt_bin_log) { if (mysql_bin_log.open_index_file(opt_binlog_index_name, opt_bin_logname, TRUE)) @@ -5333,7 +5333,7 @@ static int init_server_components() } } - if (opt_bin_log) + if (!opt_help && opt_bin_log) { log_bin_basename= rpl_make_log_name(opt_bin_logname, pidfile_name, |