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 zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my41-bug17583

Browse Source 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
This commit is contained in:
cmiller@zippy.cornsilk.net
2006-10-09 18:46:28 -04:00
parent 40bcedf4e3 4812d81eab
commit 4d0023edf6
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/collapsed
View File

@ -3,3 +3,4 @@
44edb86b1iE5knJ97MbliK_3lCiAXA
44f33f3aj5KW5qweQeekY1LU0E9ZCg
4513d8e4Af4dQWuk13sArwofRgFDQw
452a92d0-31-8wSzSfZi165fcGcXPA

15
client/mysql.cc
View File

@ -384,6 +384,21 @@ int main(int argc,char *argv[])
else
status.add_to_history=1;
status.exit_status=1;
{
/*
The file descriptor-layer may be out-of-sync with the file-number layer,
so we make sure that "stdout" is really open. If its file is closed then
explicitly close the FD layer.
*/
int stdout_fileno_copy;
stdout_fileno_copy= dup(fileno(stdout)); /* Okay if fileno fails. */
if (stdout_fileno_copy == -1)
fclose(stdout);
else
close(stdout_fileno_copy); /* Clean up dup(). */
}
load_defaults("my",load_default_groups,&argc,&argv);
defaults_argv=argv;
if (get_options(argc, (char **) argv))