diff options
| author | unknown <jani@labbari.dsl.inet.fi> | 2007-07-06 09:51:02 +0300 |
|---|---|---|
| committer | unknown <jani@labbari.dsl.inet.fi> | 2007-07-06 09:51:02 +0300 |
| commit | 0b24005753b8ddc05827aa29744f75a8538bfeba (patch) | |
| tree | 9df295c9769e2314016f4582bdc66818297f19a3 /libmysql | |
| parent | 7edcebc97a817f7b157df86504e937600a2716d2 (diff) | |
| parent | cb3ce981c70a0dd12433c9f99994a092f732edaf (diff) | |
| download | mariadb-git-0b24005753b8ddc05827aa29744f75a8538bfeba.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel
libmysql/libmysql.c:
Auto merged
mysql-test/r/innodb_mysql.result:
Manual merge from main 5.1 to 5.1-marvel.
mysql-test/t/innodb_mysql.test:
Manual merge from main 5.1 to 5.1-marvel.
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index cb60fb20863..72bc4445d83 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -168,8 +168,23 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)), } +/* + Free all memory and resources used by the client library + + NOTES + When calling this there should not be any other threads using + the library. + + To make things simpler when used with windows dll's (which calls this + function automaticly), it's safe to call this function multiple times. +*/ + + void STDCALL mysql_server_end() { + if (!mysql_client_init) + return; + #ifdef EMBEDDED_LIBRARY end_embedded_server(); #endif |