diff options
| author | Marc Alff <marc.alff@oracle.com> | 2010-03-07 10:41:51 -0700 |
|---|---|---|
| committer | Marc Alff <marc.alff@oracle.com> | 2010-03-07 10:41:51 -0700 |
| commit | 8c28d0d1cfa5cb4295f9160cdf8e75fc7aac13ef (patch) | |
| tree | 280ee80ca70a5eed79ecfe0cb919f71babd5f552 /sql | |
| parent | 18884b02c08be7cf45fda7a686943c5a85dedf6f (diff) | |
| parent | 72ffdcb2a51122400614b78c28fe1567a6f68792 (diff) | |
| download | mariadb-git-8c28d0d1cfa5cb4295f9160cdf8e75fc7aac13ef.tar.gz | |
local merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysql_priv.h | 3 | ||||
| -rw-r--r-- | sql/mysqld.cc | 13 | ||||
| -rw-r--r-- | sql/sys_vars.cc | 3 |
3 files changed, 17 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 3e1929a6565..4e672f1d6c7 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -2687,7 +2687,8 @@ enum options_mysqld OPT_SSL_CIPHER, OPT_SSL_KEY, OPT_WANT_CORE, - OPT_ENGINE_CONDITION_PUSHDOWN + OPT_ENGINE_CONDITION_PUSHDOWN, + OPT_LOG_ERROR }; #endif /* MYSQL_SERVER */ diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2e908eb3366..37713992a90 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3962,6 +3962,11 @@ static int init_server_components() else fn_format(log_error_file, log_error_file_ptr, mysql_data_home, ".err", MY_UNPACK_FILENAME | MY_SAFE_PATH); + /* + _ptr may have been set to my_disabled_option or "" if no argument was + passed, but we need to show the real name in SHOW VARIABLES: + */ + log_error_file_ptr= log_error_file; if (!log_error_file[0]) opt_error_log= 0; // Too long file name else @@ -7357,6 +7362,14 @@ mysqld_get_one_option(int optid, global_system_variables.optimizer_switch&= ~OPTIMIZER_SWITCH_ENGINE_CONDITION_PUSHDOWN; break; + case OPT_LOG_ERROR: + /* + "No --log-error" == "write errors to stderr", + "--log-error without argument" == "write errors to a file". + */ + if (argument == NULL) /* no argument */ + log_error_file_ptr= const_cast<char*>(""); + break; } return 0; } diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index d500d772b80..2e239a9161c 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -895,7 +895,8 @@ static Sys_var_mybool Sys_trust_function_creators( static Sys_var_charptr Sys_log_error( "log_error", "Error log file", - READ_ONLY GLOBAL_VAR(log_error_file_ptr), CMD_LINE(OPT_ARG), + READ_ONLY GLOBAL_VAR(log_error_file_ptr), + CMD_LINE(OPT_ARG, OPT_LOG_ERROR), IN_FS_CHARSET, DEFAULT(disabled_my_option)); static Sys_var_mybool Sys_log_queries_not_using_indexes( |