1 files changed, 7 insertions, 0 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 19cfedce51d..c8859484f8b 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -155,9 +155,16 @@ void STDCALL mysql_server_end()
 {
   /* If library called my_init(), free memory allocated by it */
   if (!org_my_init_done)
+  {
     my_end(0);
+#ifndef THREAD
+  /* Remove TRACING, if enabled by mysql_debug() */
+    DBUG_POP();
+#endif
+  }
   else
     mysql_thread_end();
+  mysql_client_init= org_my_init_done= 0;
 }
 
 #endif /*EMBEDDED_LIBRARY*/