diff options
| author | unknown <hf@deer.(none)> | 2003-10-21 16:05:17 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-10-21 16:05:17 +0500 |
| commit | 8d94e500e025fb5626df12c8183e8ab14c74e624 (patch) | |
| tree | 6bd29233c656d8429437a224f9c3588a94963cb4 /libmysqld | |
| parent | d894f23372ad7abd1efd108562574b4d15dd0709 (diff) | |
| download | mariadb-git-8d94e500e025fb5626df12c8183e8ab14c74e624.tar.gz | |
Fix for Windows bug reported throuhg Miguel
libmysqld/lib_sql.cc:
This code seems to be superfluous
sql/derror.cc:
in embedded server these functions should return the sign of the error
instead of halting the program
sql/init.cc:
my_abort_hook left unchanged
sql/mysql_priv.h:
declaration of init_errmessage changed
unireg_abort was replaced with DBUG_RETURN for embedded server
sql/mysqld.cc:
these functions don't work in embedded server thus #ifdef-ed
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index c9f98a701ef..d4cb916a89c 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -435,11 +435,6 @@ void STDCALL mysql_server_end() my_free((char*) copy_arguments_ptr, MYF(MY_ALLOW_ZERO_PTR)); copy_arguments_ptr=0; clean_up(0); -#ifdef THREAD - /* Don't call my_thread_end() if the application is using MY_INIT() */ - if (!org_my_init_done) - my_thread_end(); -#endif /* If library called my_init(), free memory allocated by it */ if (!org_my_init_done) my_end(0); |