From 18dbf044d040ce3826ed838dea1e60662e7fb5bd Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Tue, 19 Oct 2010 18:11:30 +0200
Subject: [PATCH] fixed a bad merge

---
 sql/mysqld.cc | 8 --------
 1 file changed, 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
   }
-- 
2.30.9