diff options
| author | unknown <knielsen@mysql.com> | 2006-05-16 14:34:35 +0200 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-05-16 14:34:35 +0200 |
| commit | fa22f4191d163c561dc46d9b00fa4af92f2f645e (patch) | |
| tree | 08fb4ce18ad7defbb710e90b6e9b2c7cccc3eabf /libmysql | |
| parent | 1314b848644e0cc759651c045f257ee200102395 (diff) | |
| parent | 8e2bad04c9ba7c6195177a2d27f4976d009bb3e7 (diff) | |
| download | mariadb-git-fa22f4191d163c561dc46d9b00fa4af92f2f645e.tar.gz | |
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix
into mysql.com:/usr/local/mysql/tmp-5.1
client/mysqlbinlog.cc:
Auto merged
include/my_sys.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysys/my_init.c:
Auto merged
sql/mysqld.cc:
Auto merged
dbug/dbug.c:
Manual merge
include/my_dbug.h:
Manual merge
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index d117688a140..225b3926aa7 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -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); /* Remove TRACING, if enabled by mysql_debug() */ DBUG_POP(); } |