database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime

Browse Source 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
This commit is contained in:
unknown
2007-07-24 23:01:05 +04:00
parent 2a7d20308f 20b9d9bb2f
commit 8ed01f838e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/log_state.result
View File

@ -131,7 +131,7 @@ set global general_log=ON;
set global log_output=default; set global log_output=default;
show variables like 'log_output'; show variables like 'log_output';
Variable_name Value Variable_name Value
log_output TABLE log_output FILE
set global general_log=OFF; set global general_log=OFF;
set global log_output=FILE; set global log_output=FILE;
truncate table mysql.general_log; truncate table mysql.general_log;

6
sql/set_var.cc
View File

@ -2220,9 +2220,9 @@ void sys_var_log_output::set_default(THD *thd, enum_var_type type)
{ {
pthread_mutex_lock(&LOCK_global_system_variables); pthread_mutex_lock(&LOCK_global_system_variables);
logger.lock(); logger.lock();
logger.init_slow_log(LOG_TABLE); logger.init_slow_log(LOG_FILE);
logger.init_general_log(LOG_TABLE); logger.init_general_log(LOG_FILE);
*value= LOG_TABLE; *value= LOG_FILE;
logger.unlock(); logger.unlock();
pthread_mutex_unlock(&LOCK_global_system_variables); pthread_mutex_unlock(&LOCK_global_system_variables);
} }