bk commit into 5.0 tree (df:1.2488) BUG#25621

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.0 repository of df. When df 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@stripped, 2007-06-21 08:58:39+02:00, df@stripped +1 -0
  Steal part of fix for bug#25621 from monty for 5.0.44.

  libmysql/libmysql.c@stripped, 2007-06-21 08:58:36+02:00, df@stripped +15 -0
    mysql_server_end() can be called multiple times.

# 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:	df
# Host:	pippilotta.erinye.com
# Root:	/shared/home/df/mysql/build/mysql-5.0.44

--- 1.256/libmysql/libmysql.c	2007-05-24 20:51:35 +02:00
+++ 1.257/libmysql/libmysql.c	2007-06-21 08:58:36 +02:00
@@ -168,8 +168,23 @@
 }
 
 
+/*
+  Free all memory and resources used by the client library
+
+  NOTES
+    When calling this there should not be any other threads using
+    the library.
+
+    To make things simpler when used with windows dll's (which calls this
+    function automaticly), it's safe to call this function multiple times.
+*/
+
+
 void STDCALL mysql_server_end()
 {
+  if (!mysql_client_init)
+    return;
+
 #ifdef EMBEDDED_LIBRARY
   end_embedded_server();
 #endif