database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge with 5.1

Browse Source
This commit is contained in:
Sergei Golubchik
2010-10-25 15:21:16 +02:00
parent 37a78d6868 60c15066db
commit 04a4b43346
230 changed files with 4615 additions and 1320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sql/mysqld.cc
View File

@ -197,6 +197,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)
@ -4004,14 +4007,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)))
sql_print_warning("Couldn't reopen stderr");
if (!res)
setbuf(stderr, NULL);
}
}
}
@ -4666,11 +4670,8 @@ we force server id to 2, but this MySQL server will not act as a slave.");
#ifdef __WIN__
if (!opt_console)
{
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);
setbuf(stderr, NULL);
FreeConsole(); // Remove window
}