Commit 89f89787 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fixed some bugs after last merge 

Added semaphore support to MIT-pthreads.
parent a3538124

Docs/manual.texi

+4 −0
Original line number Diff line number Diff line
@@ -27362,6 +27362,10 @@ MySQL will, by default, use sockets.) 
If you connect using TCP/IP from another computer over a 100M Ethernet,

things will be 8-11 % slower.













@item













When running our benchmark with secure connections (all data encrypted













with internal ssl support) things where 55 % slower.



























@item















If you compile with @code{--with-debug=full}, then you will loose 20 %















for most queries, but some queries may take substantially longer (The

























configure.in



+14
−3






























Original line number
Diff line number
Diff line








@@ -524,6 +524,13 @@ AC_ARG_WITH(mit-threads,













if test "$with_mit_threads" = "yes"















then















  enable_largefile="no"		# Will not work on Linux.













  if test "$GXX" = "yes"













  then













    # Needed for gcc 3.0













    CCLD=g++













    export CCLD













    AC_SUBST(CCLD)













  fi















fi































# Set flags if we want to force to use pthreads










@@ -1596,13 +1603,17 @@ ac_save_CXXFLAGS="$CXXFLAGS"













AC_CACHE_CHECK([style of gethost* routines], mysql_cv_gethost_style,















AC_LANG_SAVE















AC_LANG_CPLUSPLUS













# Do not treat warnings as errors if we are linking agaist other libc



























# Do not treat warnings as errors if we are linking against other libc















# this is to work around gcc not being permissive on non-system includes















# with respect to ANSI C++













# We also remove the -fbranch-probabilities option as this will give warnings













# about not profiled code, which confuses configure















if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"















then













  CXXFLAGS="$CXXFLAGS -Werror"













  CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed 's/-fbranch-probabilities//'`















fi





























AC_TRY_COMPILE(















[#undef inline















#if !defined(SCO) && !defined(__osf__) && !defined(_REENTRANT)

































include/my_semaphore.h



+11
−10






























Original line number
Diff line number
Diff line








@@ -31,12 +31,12 @@













#ifndef _my_semaphore_h_















#define _my_semaphore_h_





























C_MODE_START





























#ifndef __WIN__















#include <semaphore.h>















#else





























C_MODE_START





























typedef HANDLE sem_t;















int sem_init(sem_t * sem, int pshared, unsigned int value);















int sem_destroy(sem_t * sem);









@@ -46,6 +46,7 @@ int sem_post (sem_t * sem);













int sem_post_multiple(sem_t * sem,int count);















int sem_getvalue(sem_t * sem, int * sval);





























C_MODE_END















#endif /* __WIN__ */



























C_MODE_END















#endif /* !_my_semaphore_h_ */
























mit-pthreads/Changes-mysql



+5
−1






























Original line number
Diff line number
Diff line













Changes done to this distrubtion (pthreads-1_60_beta6) by Monty (monty@mysql.com)













Changes done to this distrubtion (pthreads-1_60_beta6) by Monty













(monty@mysql.com)



























02.06.20













- Added support for semaphores.































02.05.07















- Hacked some files to get it to compile (not work) with glibc 2.2

































mit-pthreads/include/Makefile.inc



+1
−1






























Original line number
Diff line number
Diff line








@@ -7,7 +7,7 @@













































FILES= cond.h copyright.h fd.h fd_pipe.h kernel.h mutex.h posix.h \













	   pthread.h pthread_attr.h queue.h util.h 













	   pthread.h pthread_attr.h queue.h util.h semaphore.h































# Machine dependent header file















MFILE= ${.CURDIR}/arch/${MACHINE}/machdep.h