From: antony
Date: December 25 2005 11:29am
Subject: bk commit into 5.1 tree (acurtis:1.1988) BUG#15976
List-Archive: http://lists.mysql.com/commits/402
X-Bug: 15976
Message-Id: <200512251130.jBPBUJwH000684@mail.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony 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.1988 05/12/25 03:29:49 acurtis@stripped +3 -0
  Bug#15976: Multiply warnings about unfreed memory
    leaks caused by Archive storage engine not closing files and
    storage engines not receiving panic() during shutdown

  storage/archive/azio.c
    1.4 05/12/25 03:29:40 acurtis@stripped +1 -1
    typo perhaps. azio was not closing files.

  sql/mysqld.cc
    1.507 05/12/25 03:29:40 acurtis@stripped +1 -1
    Make sure storage engines get panic() call by moving it before plugin_free()

  sql/ha_archive.cc
    1.69 05/12/25 03:29:40 acurtis@stripped +0 -2
    surplus my_close() call not neccessary as azclose() should work

# 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:	acurtis
# Host:	ltantony.(none)
# Root:	/home/antony/work2/p4-bug15976

--- 1.506/sql/mysqld.cc	2005-12-21 20:10:52 -08:00
+++ 1.507/sql/mysqld.cc	2005-12-25 03:29:40 -08:00
@@ -1152,6 +1152,7 @@
   lex_free();				/* Free some memory */
   set_var_free();
   free_charsets();
+  (void) ha_panic(HA_PANIC_CLOSE);	/* close all tables and logs */
   if (!opt_noacl)
   {
 #ifdef HAVE_DLOPEN
@@ -1159,7 +1160,6 @@
 #endif
     plugin_free();
   }
-  (void) ha_panic(HA_PANIC_CLOSE);	/* close all tables and logs */
   if (tc_log)
     tc_log->close();
   xid_cache_free();

--- 1.68/sql/ha_archive.cc	2005-12-23 12:22:21 -08:00
+++ 1.69/sql/ha_archive.cc	2005-12-25 03:29:40 -08:00
@@ -591,8 +591,6 @@
     goto error2;
   }
 
-  my_close(create_file, MYF(0));
-
   DBUG_RETURN(0);
 
 error3:

--- 1.3/storage/archive/azio.c	2005-12-23 17:51:03 -08:00
+++ 1.4/storage/archive/azio.c	2005-12-25 03:29:40 -08:00
@@ -267,7 +267,7 @@
       err = inflateEnd(&(s->stream));
     }
   }
-  if (s->file < 0 && my_close(s->file, MYF(0))) 
+  if (s->file > 0 && my_close(s->file, MYF(0))) 
   {
 #ifdef ESPIPE
     if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */