Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my41-bug17583

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583


BitKeeper/deleted/.del-collapsed~fbec3523369aae99:
  Delete: BitKeeper/etc/collapsed
BitKeeper/etc/collapsed:
  'Auto converge'
client/mysql.cc:
  Auto merged
BitKeeper/deleted/.del-mysql_client.result:
  File is gone.
BitKeeper/deleted/.del-mysql_client.test:
  File is gone.

BitKeeper/etc/collapsed

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

client/mysql.cc

@@ -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))