From 4f936a69a798483b318fad4124641256eb0ce380 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 16 Oct 2003 20:55:15 +0300 Subject: 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) --- libmysqld/lib_sql.cc | 5 ----- 1 file changed, 5 deletions(-) (limited to 'libmysqld') 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); -- cgit v1.2.1 From 40ed42e14a7911a879c11e0b23b0730d763f6651 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 31 Oct 2003 17:13:42 +0300 Subject: minor fix in rm libmysqld/Makefile.am: minor fix for rm --- libmysqld/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libmysqld') diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index d831d2a7a5a..54bfd6503d4 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -89,10 +89,10 @@ libmysqld.a: libmysqld_int.a $(INC_LIB) ar x $$file; \ for obj in *.o ; do mv $$obj $${bfile}_$$obj ; done ; \ ar q ../libmysqld_int2.a *.o ; \ - rm *.o ; \ + rm -f *.o ; \ done mv libmysqld_int2.a libmysqld.a - rm tmp/* + rm -f tmp/* $(RANLIB) libmysqld.a ## XXX: any time the client interface changes, we'll need to bump -- cgit v1.2.1