From 20b9d9bb2ffec3eb2490047b4c9e4b6502342904 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 23 Jul 2007 22:01:22 -0600 Subject: Bug#29993 (Default value of log_output should be 'FILE', not 'TABLE') Changed the default location of the log output to LOG_FILE, for backward compatibility with MySQL 5.0 mysql-test/r/log_state.result: Changed the default location of the log output to LOG_FILE, for backward compatibility with MySQL 5.0 sql/set_var.cc: Changed the default location of the log output to LOG_FILE, for backward compatibility with MySQL 5.0 --- mysql-test/r/log_state.result | 2 +- sql/set_var.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql-test/r/log_state.result b/mysql-test/r/log_state.result index 946797aeec7..38b3ebd6e98 100644 --- a/mysql-test/r/log_state.result +++ b/mysql-test/r/log_state.result @@ -131,7 +131,7 @@ set global general_log=ON; set global log_output=default; show variables like 'log_output'; Variable_name Value -log_output TABLE +log_output FILE set global general_log=OFF; set global log_output=FILE; truncate table mysql.general_log; diff --git a/sql/set_var.cc b/sql/set_var.cc index bd5234b42be..7f3e808090d 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2220,9 +2220,9 @@ void sys_var_log_output::set_default(THD *thd, enum_var_type type) { pthread_mutex_lock(&LOCK_global_system_variables); logger.lock(); - logger.init_slow_log(LOG_TABLE); - logger.init_general_log(LOG_TABLE); - *value= LOG_TABLE; + logger.init_slow_log(LOG_FILE); + logger.init_general_log(LOG_FILE); + *value= LOG_FILE; logger.unlock(); pthread_mutex_unlock(&LOCK_global_system_variables); } -- cgit v1.2.1