summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorKristofer Pettersson <kristofer.pettersson@oracle.com>2010-09-07 13:34:18 +0200
committerKristofer Pettersson <kristofer.pettersson@oracle.com>2010-09-07 13:34:18 +0200
commit8e2468a85ebc72cfbc9f12a9e1f957fb35780063 (patch)
tree1c2683c61cc3ef63a418b0a677c0819ae8ff222a /sql/mysqld.cc
parent9a4a7cf184b40b203702043f886f9bd9c26592fd (diff)
parent9b3a3944e458c86b5273f2f1f375dd5fa30e92d5 (diff)
downloadmariadb-git-8e2468a85ebc72cfbc9f12a9e1f957fb35780063.tar.gz
Manual resolve of mysql-test/r/gis.result
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc19
1 files changed, 12 insertions, 7 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 08407d52e09..d9c4c7fc3f5 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -199,6 +199,9 @@ typedef fp_except fp_except_t;
# endif
#endif
+extern "C" my_bool reopen_fstreams(const char *filename,
+ FILE *outstream, FILE *errstream);
+
inline void setup_fpu()
{
#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H)
@@ -3821,13 +3824,15 @@ static int init_server_components()
opt_error_log= 1; // Too long file name
else
{
+ my_bool res;
#ifndef EMBEDDED_LIBRARY
- if (freopen(log_error_file, "a+", stdout))
+ res= reopen_fstreams(log_error_file, stdout, stderr);
+#else
+ res= reopen_fstreams(log_error_file, NULL, stderr);
#endif
- {
- if (freopen(log_error_file, "a+", stderr))
- setbuf(stderr, NULL);
- }
+
+ if (!res)
+ setbuf(stderr, NULL);
}
}
@@ -4475,8 +4480,8 @@ we force server id to 2, but this MySQL server will not act as a slave.");
#ifdef __WIN__
if (!opt_console)
{
- freopen(log_error_file,"a+",stdout);
- freopen(log_error_file,"a+",stderr);
+ if (reopen_fstreams(log_error_file, stdout, stderr))
+ unireg_abort(1);
setbuf(stderr, NULL);
FreeConsole(); // Remove window
}