bk commit into 5.0 tree (cmiller:1.2278)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-09 18:54:48-04:00, cmiller@stripped +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
  MERGE: 1.2258.55.4

  BitKeeper/etc/collapsed@stripped, 2006-10-09 18:54:18-04:00, cmiller@stripped +1 -1
    auto-union
    MERGE: 1.4.3.3

  client/mysql.cc@stripped, 2006-10-09 18:54:40-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.218.1.2

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/bug17583/my50-bug17583/RESYNC

--- 1.221/client/mysql.cc	2006-10-09 18:55:01 -04:00
+++ 1.222/client/mysql.cc	2006-10-09 18:55:01 -04:00
@@ -388,6 +388,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))

--- 1.8/BitKeeper/etc/collapsed	2006-10-09 18:55:01 -04:00
+++ 1.9/BitKeeper/etc/collapsed	2006-10-09 18:55:01 -04:00
@@ -9,3 +9,4 @@
 451ab499rgdjXyOnUDqHu-wBDoS-OQ
 45214442pBGT9KuZEGixBH71jTzbOA
 45214a07hVsIGwvwa-WrO-jpeaSwVw
+452a92d0-31-8wSzSfZi165fcGcXPA