bk commit into 4.1 tree (hf:1.2353) BUG#12177

[holyfoot]

Below is the list of changes that have just been committed into a local
4.1 repository of hf. When hf 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
  1.2353 05/07/27 20:20:24 hf@deer.(none) +2 -0
  Fix for bug #12177 (errorlog file isn't closed)
  4.1 version of the fix

  sql/mysqld.cc
    1.584 05/07/27 20:19:41 hf@deer.(none) +2 -1
    code added to store reordered stderror_file

  libmysqld/lib_sql.cc
    1.125 05/07/27 20:19:41 hf@deer.(none) +5 -0
    closing added

# 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:	hf
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-4.1.clone

--- 1.583/sql/mysqld.cc	Tue Jul 26 20:58:57 2005
+++ 1.584/sql/mysqld.cc	Wed Jul 27 20:19:41 2005
@@ -382,6 +382,7 @@
 
 
 FILE *bootstrap_file;
+static FILE *stderror_file=0;
 
 I_List<i_string_pair> replicate_rewrite_db;
 I_List<i_string> replicate_do_db, replicate_ignore_db;
@@ -2767,7 +2768,7 @@
 #ifndef EMBEDDED_LIBRARY
       if (freopen(log_error_file, "a+", stdout))
 #endif
-	freopen(log_error_file, "a+", stderr);
+	stderror_file= freopen(log_error_file, "a+", stderr);
     }
   }
 

--- 1.124/libmysqld/lib_sql.cc	Wed Jul 27 19:47:25 2005
+++ 1.125/libmysqld/lib_sql.cc	Wed Jul 27 20:19:41 2005
@@ -477,6 +477,11 @@
   my_free((char*) copy_arguments_ptr, MYF(MY_ALLOW_ZERO_PTR));
   copy_arguments_ptr=0;
   clean_up(0);
+  if (stderror_file)
+  {
+    fclose(stderror_file);
+    stderror_file=0;
+  }
 }
 
 } /* extern "C" */