Below is the list of changes that have just been committed into a
4.0 repository of sasha. When sasha does a push, they will be propogated to
the main repository and within 24 hours after the push to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet@stripped, 2002-04-05 23:07:25-07:00, sasha@stripped
safemalloc cleanup. Maybe it will now compile on FreeBSD. I still not have
access to a FreeBSD box, though.
mysys/my_static.h
1.11 02/04/05 23:07:23 sasha@stripped +2 -2
cleanup
mysys/safemalloc.c
1.11 02/04/05 23:07:23 sasha@stripped +1 -1
cleanup
sql/mysqld.cc
1.297 02/04/05 23:07:23 sasha@stripped +6 -0
initialize some safemalloc variables in main()
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: sasha
# Host: mysql.sashanet.com
# Root: /reiser-data/mysql-4.0
--- 1.10/mysys/my_static.h Tue Apr 2 14:31:39 2002
+++ 1.11/mysys/my_static.h Fri Apr 5 23:07:23 2002
@@ -61,10 +61,10 @@
#ifdef THREAD
/*
- These threads are except from safemalloc leak scrutiny unless
+ These threads are exempt from safemalloc leak scrutiny unless
PEDANTIC_SAFEMALLOC is defined
*/
-extern pthread_t signal_thread, kill_thread;
+extern pthread_t signal_th, kill_th, main_th;
#endif
#ifndef HAVE_TEMPNAM
--- 1.10/mysys/safemalloc.c Tue Apr 2 14:31:39 2002
+++ 1.11/mysys/safemalloc.c Fri Apr 5 23:07:23 2002
@@ -73,7 +73,7 @@
#include "mysys_err.h"
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 pPrev tInt._pPrev
--- 1.296/sql/mysqld.cc Wed Apr 3 06:09:01 2002
+++ 1.297/sql/mysqld.cc Fri Apr 5 23:07:23 2002
@@ -1720,6 +1720,12 @@
my_umask=0660; // Default umask for new files
my_umask_dir=0700; // Default umask for new directories
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
tzset(); // Set tzname
