diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rw-r--r-- | sql/sys_vars.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 20090d0f313..d9143e43e42 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6287,7 +6287,6 @@ struct my_option my_long_options[]= {"log", 'l', "Log connections and queries to file (deprecated option, use " "--general-log/--general-log-file instead).", &opt_logname, &opt_logname, 0, GET_STR_ALLOC, OPT_ARG, 0, 0, 0, 0, 0, 0}, -#if 0 {"log-basename", OPT_LOG_BASENAME, "Basename for all log files and the .pid file. This sets all log file " "names at once (in 'datadir') and is normally the only option you need " @@ -6296,7 +6295,6 @@ struct my_option my_long_options[]= "--log-slow-query-log-file, --log-error-file, and --pid-file", &opt_log_basename, &opt_log_basename, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, -#endif {"log-bin", OPT_BIN_LOG, "Log update queries in binary format. Optional argument should be name for " "binary log. If not given " diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index bb6a130cf5a..88a1b2f6da6 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -3385,6 +3385,7 @@ static Sys_var_mybool Sys_thread_alarm( READ_ONLY GLOBAL_VAR(opt_thread_alarm), CMD_LINE(OPT_ARG), DEFAULT(TRUE)); +#if 0 static Sys_var_charptr Sys_log_basename( "log_basename", "Basename for all log files and the .pid file. This sets all log file " @@ -3397,6 +3398,7 @@ static Sys_var_charptr Sys_log_basename( READ_ONLY GLOBAL_VAR(opt_log_basename), CMD_LINE(REQUIRED_ARG, OPT_LOG_BASENAME), IN_FS_CHARSET, DEFAULT(0)); +#endif static Sys_var_mybool Sys_query_cache_strip_comments( "query_cache_strip_comments", |