summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorMikael Ronstrom <mikael@mysql.com>2008-12-20 11:53:27 +0100
committerMikael Ronstrom <mikael@mysql.com>2008-12-20 11:53:27 +0100
commit460cde4c6ef7fb15ccbc2e154d0b4c68a461bfab (patch)
tree56dac4082e41c0fd9eb3edadd8a323f0a151b802 /libmysql
parent16a024c486f75b9eadc046511f48a23e566e9c4b (diff)
parent886faef7ee8f70600ccb0fc94234e70636112134 (diff)
downloadmariadb-git-460cde4c6ef7fb15ccbc2e154d0b4c68a461bfab.tar.gz
Merge dtrace patch with latest performance version
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 1eab4199deb..ca329eadf0f 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -207,9 +207,7 @@ void STDCALL mysql_server_end()
/* If library called my_init(), free memory allocated by it */
if (!org_my_init_done)
{
- my_end(MY_DONT_FREE_DBUG);
- /* Remove TRACING, if enabled by mysql_debug() */
- DBUG_POP();
+ my_end(0);
}
else
{