diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-10-16 20:55:15 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-10-16 20:55:15 +0300 |
| commit | 4f936a69a798483b318fad4124641256eb0ce380 (patch) | |
| tree | 15abb95c73d02f77be5ffd9d90398f905401d815 /libmysqld | |
| parent | 8ddb4b7c553508fbf48fb3026909a35bac98d32e (diff) | |
| download | mariadb-git-4f936a69a798483b318fad4124641256eb0ce380.tar.gz | |
Safety fix to detect multiple calls to my_thread_end()
Portability fix (For Mac OS X)
configure.in:
Added detection of malloc / sys/malloc
include/my_pthread.h:
Safety fix to detect multiple calls to my_thread_end()
libmysqld/lib_sql.cc:
Remove duplicate call to my_thread_end()
mysys/charset.c:
Cleanup indentation
Remove some short variable names
mysys/my_thr_init.c:
Safety fix to detect multiple calls to my_thread_end()
sql/sql_test.cc:
Portability fix (For Mac OS X)
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 52ff08b8787..d33f384f81e 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -621,11 +621,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); |