Commit bd6aaee9 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into mishka.local:/home/my/mysql-5.0
parents bb2b8120 18d0e6a7

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -5871,7 +5871,7 @@ static void mysql_init_variables(void) 
  opt_skip_slave_start= opt_reckless_slave = 0;

  mysql_home[0]= pidfile_name[0]= log_error_file[0]= 0;

  opt_log= opt_update_log= opt_slow_log= 0;

  opt_bin_log= 1;                               // Enable binlog by default

  opt_bin_log= 0;

  opt_disable_networking= opt_skip_show_db=0;

  opt_logname= opt_update_logname= opt_binlog_index_name= opt_slow_logname= 0;

  opt_tc_log_file= (char *)"tc.log";      // no hostname in tc_log file name !