database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

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

Browse Source 
into  damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime
This commit is contained in:
dkatz@damien-katzs-computer.local
2007-12-12 13:14:02 -05:00
parent 657ce57e4e 9a2b51d34a
commit ed00d6955a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/mysqld.cc
View File

@@ -478,7 +478,7 @@ ulong thread_id=1L,current_pid;
ulong slow_launch_threads = 0, sync_binlog_period;
ulong expire_logs_days = 0;
ulong rpl_recovery_rank=0;
const char *log_output_str= "TABLE";
const char *log_output_str= "FILE";
time_t server_start_time;
@@ -7495,7 +7495,7 @@ mysqld_get_one_option(int optid,
{
if (!argument || !argument[0])
{
log_output_options= LOG_TABLE;
log_output_options= LOG_FILE;
log_output_str= log_output_typelib.type_names[1];
}
else