diff options
| author | unknown <monty@mishka.local> | 2005-05-14 19:32:28 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2005-05-14 19:32:28 +0300 |
| commit | bd6aaee935aae710adc9775250e2eaebc24193ef (patch) | |
| tree | e6d9bc1186932f1b4e3a8a92e2c5dd6f0e16abb2 /sql | |
| parent | bb2b8120615f48cd17682aa810e54b20a7002c77 (diff) | |
| parent | 18d0e6a73d1dca6b967e8f006012f78e7af74140 (diff) | |
| download | mariadb-git-bd6aaee935aae710adc9775250e2eaebc24193ef.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 |
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 ! |