From: Date: August 4 2005 12:23pm
Subject: bk commit into 4.1 tree (hf:1.2376) BUG#12177
List-Archive: http://lists.mysql.com/internals/27883
X-Bug: 12177
Message-Id: <200508041023.j74ANQic021789@localhost.localdomain>

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.2376 05/08/04 15:23:21 hf@deer.(none) +3 -0
  Fix for bug #12177 (errorlog file isn't closed)
  4.1 version of the patch

  sql/mysqld.cc
    1.584 05/08/04 15:22:35 hf@deer.(none) +2 -1
    stderror_file saved

  sql/mysql_priv.h
    1.362 05/08/04 15:22:35 hf@deer.(none) +1 -0
    stderror_file declared

  libmysql/libmysql.c
    1.298 05/08/04 15:22:34 hf@deer.(none) +7 -0
    here we close errorlog file

# 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.clean

--- 1.297/libmysql/libmysql.c	Tue Jul 19 20:11:55 2005
+++ 1.298/libmysql/libmysql.c	Thu Aug  4 15:22:34 2005
@@ -188,6 +188,13 @@
     mysql_thread_end();
   free_charsets();
   mysql_client_init= org_my_init_done= 0;
+#ifdef EMBEDDED_SERVER
+  if (stderror_file)
+  {
+    fclose(stderror_file);
+    stderror_file= 0;
+  }
+#endif
 }
 
 static MYSQL_PARAMETERS mysql_internal_parameters=

--- 1.361/sql/mysql_priv.h	Wed Jul 27 15:21:36 2005
+++ 1.362/sql/mysql_priv.h	Thu Aug  4 15:22:35 2005
@@ -941,6 +941,7 @@
 
 extern MYSQL_LOG mysql_log,mysql_update_log,mysql_slow_log,mysql_bin_log;
 extern FILE *bootstrap_file;
+extern FILE *stderror_file;
 extern pthread_key(MEM_ROOT**,THR_MALLOC);
 extern pthread_mutex_t LOCK_mysql_create_db,LOCK_Acl,LOCK_open,
        LOCK_thread_count,LOCK_mapped_file,LOCK_user_locks, LOCK_status,

--- 1.583/sql/mysqld.cc	Tue Jul 26 20:58:57 2005
+++ 1.584/sql/mysqld.cc	Thu Aug  4 15:22:35 2005
@@ -382,6 +382,7 @@
 
 
 FILE *bootstrap_file;
+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);
     }
   }