bk commit into 5.0 tree (knielsen:1.2143)

[knielsen]

Below is the list of changes that have just been committed into a local
5.0 repository of knielsen. When knielsen 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.2143 06/05/15 18:07:59 knielsen@stripped +3 -0
  Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix
  into  mysql.com:/usr/local/mysql/tmp-5.0

  sql/mysqld.cc
    1.547 06/05/15 18:07:52 knielsen@stripped +0 -0
    Auto merged

  libmysql/libmysql.c
    1.243 06/05/15 18:07:52 knielsen@stripped +0 -0
    Auto merged

  include/my_sys.h
    1.180 06/05/15 18:07:52 knielsen@stripped +0 -0
    Auto merged

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/tmp-5.0/RESYNC

--- 1.179/include/my_sys.h	2006-05-02 04:10:44 +02:00
+++ 1.180/include/my_sys.h	2006-05-15 18:07:52 +02:00
@@ -75,6 +75,7 @@
 
 #define MY_CHECK_ERROR	1	/* Params to my_end; Check open-close */
 #define MY_GIVE_INFO	2	/* Give time info about process*/
+#define MY_DONT_FREE_DBUG 4     /* Do not call DBUG_END() in my_end() */
 
 #define ME_HIGHBYTE	8	/* Shift for colours */
 #define ME_NOCUR	1	/* Don't use curses message */

--- 1.242/libmysql/libmysql.c	2006-05-08 17:09:02 +02:00
+++ 1.243/libmysql/libmysql.c	2006-05-15 18:07:52 +02:00
@@ -178,7 +178,7 @@
   /* If library called my_init(), free memory allocated by it */
   if (!org_my_init_done)
   {
-    my_end(0);
+    my_end(MY_DONT_FREE_DBUG);
 #ifndef THREAD
   /* Remove TRACING, if enabled by mysql_debug() */
     DBUG_POP();

--- 1.546/sql/mysqld.cc	2006-05-08 17:09:02 +02:00
+++ 1.547/sql/mysqld.cc	2006-05-15 18:07:52 +02:00
@@ -986,6 +986,10 @@
     pthread_join(select_thread, NULL);		// wait for main thread
 #endif /* __NETWARE__ */
 
+#if defined(__NETWARE__) || (defined(USE_ONE_SIGNAL_HAND) && !defined(__WIN__) && !defined(OS2))
+  my_thread_end();
+#endif
+
   pthread_exit(0);				/* purecov: deadcode */
 
 #endif /* EMBEDDED_LIBRARY */