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 /sql/sql_test.cc | |
| 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 'sql/sql_test.cc')
| -rw-r--r-- | sql/sql_test.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc index 6498a52cc09..a217d40246f 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -22,7 +22,11 @@ #include "sql_select.h" #include <hash.h> #include <thr_alarm.h> +#if defined(HAVE_MALLINFO) && defined(HAVE_MALLOC_H) #include <malloc.h> +#elif defined(HAVE_MALLINFO) && defined(HAVE_SYS_MALLOC_H) +#include <sys/malloc.h> +#endif /* Intern key cache variables */ extern "C" pthread_mutex_t THR_LOCK_keycache; |