mirror of
https://github.com/MariaDB/server.git
synced 2026-04-21 15:55:53 +02:00
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix
into mysql.com:/usr/local/mysql/tmp-5.0 include/my_sys.h: Auto merged libmysql/libmysql.c: Auto merged sql/mysqld.cc: Auto merged
This commit is contained in:
commit
167d54cd63
7 changed files with 84 additions and 20 deletions
|
|
@ -178,7 +178,7 @@ void STDCALL mysql_server_end()
|
|||
/* If library called my_init(), free memory allocated by it */
|
||||
if (!org_my_init_done)
|
||||
{
|
||||
my_end(0);
|
||||
my_end(MY_DONT_FREE_DBUG);
|
||||
#ifndef THREAD
|
||||
/* Remove TRACING, if enabled by mysql_debug() */
|
||||
DBUG_POP();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue