summaryrefslogtreecommitdiff
path: root/libmysql/libmysql.c
diff options
context:
space:
mode:
authorunknown <df@pippilotta.erinye.com>2007-06-21 08:58:39 +0200
committerunknown <df@pippilotta.erinye.com>2007-06-21 08:58:39 +0200
commitf8034d36ba5670e72374d61ca4901a71adbd6d9f (patch)
treed93851e1d91d78d8a71bd048924f4efcb3be0612 /libmysql/libmysql.c
parentaeddf24a2f100aaef22ec807fce3f11edb9be70b (diff)
downloadmariadb-git-f8034d36ba5670e72374d61ca4901a71adbd6d9f.tar.gz
Steal part of fix for bug#25621 from monty for 5.0.44.
libmysql/libmysql.c: mysql_server_end() can be called multiple times.
Diffstat (limited to 'libmysql/libmysql.c')
-rw-r--r--libmysql/libmysql.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index e426d2c549e..121167763ed 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