database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

safemalloc cleanup. Maybe it will now compile on FreeBSD. I still not have

Browse Source 
access to a FreeBSD box, though.


mysys/my_static.h:
  cleanup
mysys/safemalloc.c:
  cleanup
sql/mysqld.cc:
  initialize some safemalloc variables in main()
This commit is contained in:
unknown
2002-04-05 23:07:25 -07:00
parent 91c373fc72
commit a28f2ca67d
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysys/my_static.h
View File

@ -61,10 +61,10 @@ extern uint my_once_extra;
#ifdef THREAD #ifdef THREAD
/* /*
These threads are except from safemalloc leak scrutiny unless These threads are exempt from safemalloc leak scrutiny unless
PEDANTIC_SAFEMALLOC is defined PEDANTIC_SAFEMALLOC is defined
*/ */
extern pthread_t signal_thread, kill_thread; extern pthread_t signal_th, kill_th, main_th;
#endif #endif
#ifndef HAVE_TEMPNAM #ifndef HAVE_TEMPNAM

2
mysys/safemalloc.c
View File

@ -73,7 +73,7 @@
#include "mysys_err.h" #include "mysys_err.h"
ulonglong safemalloc_mem_limit = ~(ulonglong)0; ulonglong safemalloc_mem_limit = ~(ulonglong)0;
pthread_t shutdown_th=0,main_th=0,signal_th=0; pthread_t shutdown_th,main_th,signal_th;
#define pNext tInt._pNext #define pNext tInt._pNext
#define pPrev tInt._pPrev #define pPrev tInt._pPrev

6
sql/mysqld.cc
View File

@ -1720,6 +1720,12 @@ int main(int argc, char **argv)
my_umask=0660; // Default umask for new files my_umask=0660; // Default umask for new files
my_umask_dir=0700; // Default umask for new directories my_umask_dir=0700; // Default umask for new directories
MAIN_THD; MAIN_THD;
/* initialize signal_th and shutdown_th to main_th for default value
as we need to initialize them to something safe. They are used
when compiled with safemalloc
*/
SIGNAL_THD;
SHUTDOWN_THD;
MY_INIT(argv[0]); // init my_sys library & pthreads MY_INIT(argv[0]); // init my_sys library & pthreads
tzset(); // Set tzname tzset(); // Set tzname