summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonty@mishka.local <>2005-05-14 19:32:28 +0300
committermonty@mishka.local <>2005-05-14 19:32:28 +0300
commitfdb7a69936ec49f2ecf9e82f1c059ed946f902db (patch)
treee6d9bc1186932f1b4e3a8a92e2c5dd6f0e16abb2
parent6b90352eacab0314ad33ef4e0d37dadb4688fd97 (diff)
parent600010e5835246bdfdd0375176181cfd23913245 (diff)
downloadmariadb-git-fdb7a69936ec49f2ecf9e82f1c059ed946f902db.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 12f3fe31e06..84a041167f1 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -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 !