Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0

into  labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel

1 files changed, 15 insertions, 0 deletions

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index cb60fb20863..72bc4445d83 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -168,8 +168,23 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)),
 }
 
 
+/*
+  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