summaryrefslogtreecommitdiff
path: root/dbug
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2013-07-29 16:03:41 +0200
committerVladislav Vaintroub <wlad@montyprogram.com>2013-07-29 16:03:41 +0200
commit3ef0157daa3593d2003e14fac3a7a8a249e9c048 (patch)
tree89743bedcf041c1cb81a72ca2021da2a7f4c46c4 /dbug
parent9e13011efb137728e14a89d936616a14ebee8f59 (diff)
downloadmariadb-git-3ef0157daa3593d2003e14fac3a7a8a249e9c048.tar.gz
MDEV-4815 - allow multiple mysql_server_init() / mysql_server_end() in the same process, for embedded library.
- Reset static variables that are used to signal "init done" for DBUG, in dbug_end() - Set string server variables to NULL after memory for the value is freed - avoids double free() - fix DBUG_ASSERTs that happened during reinitialization.
Diffstat (limited to 'dbug')
-rw-r--r--dbug/dbug.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c
index b285b32fa17..db5ecb7b95e 100644
--- a/dbug/dbug.c
+++ b/dbug/dbug.c
@@ -1642,6 +1642,7 @@ void _db_end_()
cs->stack= &init_settings;
FreeState(cs, 0);
+ init_done= 0;
}