diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-05 08:09:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-05 08:09:49 +0300 |
| commit | 444c380ceb26895748ce50c50be3f839393ebfd7 (patch) | |
| tree | 65b1fbf3b7caec3de48c1f76de4614a2d9793a8d /sql/mysqld.cc | |
| parent | 55dd0776566000c5ea12e177df0c784b500ab7c1 (diff) | |
| parent | 941ca92a2ca3990020b23bcc92e7ca98dcc8f814 (diff) | |
| download | mariadb-git-444c380ceb26895748ce50c50be3f839393ebfd7.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index acb7532f922..3f3f14607a1 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -792,6 +792,7 @@ char *master_info_file; char *relay_log_info_file, *report_user, *report_password, *report_host; char *opt_relay_logname = 0, *opt_relaylog_index_name=0; char *opt_logname, *opt_slow_logname, *opt_bin_logname; +char *opt_binlog_index_name=0; /* Static variables */ @@ -801,7 +802,6 @@ my_bool opt_expect_abort= 0, opt_bootstrap= 0; static my_bool opt_myisam_log; static int cleanup_done; static ulong opt_specialflag; -static char *opt_binlog_index_name; char *mysql_home_ptr, *pidfile_name_ptr; /** Initial command line arguments (count), after load_defaults().*/ static int defaults_argc; |