diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-10-19 18:11:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-10-19 18:11:30 +0200 |
| commit | da0603b6909129d83afc55f461005b0122f61253 (patch) | |
| tree | 67463d02ca02261d10249759f1d7864b4b9d37bc /sql | |
| parent | 462d14d42bb33aa5e23b5cb301ba28f56b4ca8e5 (diff) | |
| download | mariadb-git-da0603b6909129d83afc55f461005b0122f61253.tar.gz | |
fixed a bad merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index f159b58a2e1..64cefa0f928 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4624,16 +4624,8 @@ we force server id to 2, but this MySQL server will not act as a slave."); #ifdef __WIN__ if (!opt_console) { -<<<<<<< TREE - if (!freopen(log_error_file,"a+",stdout) || - !freopen(log_error_file,"a+",stderr)) - { - sql_print_warning("Couldn't reopen stdout or stderr"); - } -======= if (reopen_fstreams(log_error_file, stdout, stderr)) unireg_abort(1); ->>>>>>> MERGE-SOURCE setbuf(stderr, NULL); FreeConsole(); // Remove window } |