From: sergeyv
Date: December 1 2005 8:17pm
Subject: bk commit into 4.1 tree (SergeyV:1.2479) BUG#6536
List-Archive: http://lists.mysql.com/internals/32930
X-Bug: 6536
Message-Id: <200512012017.jB1KHRxC001925@selena.creware.com>

Below is the list of changes that have just been committed into a local
4.1 repository of sergeyv. When sergeyv 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.2479 05/12/01 23:17:00 SergeyV@selena. +1 -0
  Fixes bug #6536. When MyODBC or any other client do my_init()/my_end() 
  several times, it was causing corruption of charset data stored in once_mem_pool. 
  my_end() deallocated once_mem pool, but did not put a flag that charsets have 
  to be reloaded. The fix addresses this problem.

  mysys/my_init.c
    1.42 05/12/01 23:16:37 SergeyV@selena. +1 -0
    Fixes bug #6536. When MyODBC or any other client do my_init()/my_end() 
    several times, it was causing corruption of charset data stored in once_mem_pool. 
    my_end() deallocated once_mem pool, but did not put a flag that charsets have 
    to be reloaded. The fix addresses this problem.

# 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:	SergeyV
# Host:	selena.
# Root:	H:/MYSQL/src/#06536-mysql-4.1

--- 1.41/mysys/my_init.c	2005-09-23 16:07:28 +04:00
+++ 1.42/mysys/my_init.c	2005-12-01 23:16:37 +03:00
@@ -152,6 +152,7 @@
       DBUG_PRINT("error",("%s",errbuff[0]));
     }
   }
+  free_charsets();
   my_once_free();
 
   if ((infoflag & MY_GIVE_INFO) || print_info)