summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authormonty@mysql.com/nosik.monty.fi <>2006-11-21 22:32:58 +0200
committermonty@mysql.com/nosik.monty.fi <>2006-11-21 22:32:58 +0200
commitf6682e2743d6b3cff53a6e6b1499b28f10fb3b92 (patch)
tree7976fdc96a4eb6af989b3c9caa89d1e2cb5729d5 /libmysql
parent959e90676848a34ee7b6d66653a1d66c8a351c13 (diff)
downloadmariadb-git-f6682e2743d6b3cff53a6e6b1499b28f10fb3b92.tar.gz
Added --debug-info to most clients to detect memory leaks in mysql-test-run
Moved .progress files into the log directory Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23 Fixed some compiler warnings Fixed small memory leak in libmysql Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index e80b142e419..64f8f1be1e0 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -176,16 +176,15 @@ void STDCALL mysql_server_end()
end_embedded_server();
#endif
/* If library called my_init(), free memory allocated by it */
+ finish_client_errs();
if (!org_my_init_done)
{
my_end(MY_DONT_FREE_DBUG);
- /* Remove TRACING, if enabled by mysql_debug() */
+ /* Remove TRACING, if enabled by mysql_debug() */
DBUG_POP();
}
else
mysql_thread_end();
- finish_client_errs();
- free_charsets();
vio_end();
mysql_client_init= org_my_init_done= 0;
#ifdef EMBEDDED_SERVER