diff options
| author | unknown <knielsen@mysql.com> | 2006-05-15 19:57:12 +0200 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-05-15 19:57:12 +0200 |
| commit | 167d54cd63795a91b4e9b10226504b632c3b33b7 (patch) | |
| tree | 86fbbc9dc5f8d1552d45198060c66f8612a4ff9b /libmysql | |
| parent | f3be3b6a91aa8ac631a8ff40e49756bd9200b374 (diff) | |
| parent | a046322b4e61aaef3db9efc9e85477792085c453 (diff) | |
| download | mariadb-git-167d54cd63795a91b4e9b10226504b632c3b33b7.tar.gz | |
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
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 7713fd8dd4d..c1e0703af10 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); #ifndef THREAD /* Remove TRACING, if enabled by mysql_debug() */ DBUG_POP(); |