diff options
| author | unknown <hf@deer.(none)> | 2005-08-04 16:27:53 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2005-08-04 16:27:53 +0500 |
| commit | 4c13b4f0010338f225e716a36f0e88bb072e01e0 (patch) | |
| tree | 14b4d0985c4ec0b62128deec2534f94d13accaea /libmysql | |
| parent | 042fc75201431749f7a60caa98fc9766055f97e5 (diff) | |
| parent | 36a2a092ab7ab26d5e90f73003a48db8e313df2f (diff) | |
| download | mariadb-git-4c13b4f0010338f225e716a36f0e88bb072e01e0.tar.gz | |
Merging
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
sql/mysql_priv.h:
merging
sql/mysqld.cc:
merging
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 3931d7947aa..11ee7284cbf 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -189,6 +189,13 @@ void STDCALL mysql_server_end() finish_client_errs(); free_charsets(); mysql_client_init= org_my_init_done= 0; +#ifdef EMBEDDED_SERVER + if (stderror_file) + { + fclose(stderror_file); + stderror_file= 0; + } +#endif } static MYSQL_PARAMETERS mysql_internal_parameters= |