diff -r mysql-4.0.15a/client/sql_string.cc bkp/mysql-4.0.15a/client/sql_string.cc 27,29c27 < //Sp.Raja In LynxOS, we have fconvert but no floatingpoint.h < //#ifdef HAVE_FCONVERT < #ifdef HAVE_FLOATINGPOINT_H --- > #ifdef HAVE_FCONVERT diff -r mysql-4.0.15a/config.guess bkp/mysql-4.0.15a/config.guess 991,995d990 < #### Added by Sp.Raja, I have modified kernel version which is not 2.* nor 3.* < i*86:LynxOS:*) < echo i386-unknown-lynxos${UNAME_RELEASE} < exit 0 ;; < #### End diff -r mysql-4.0.15a/config.h.in bkp/mysql-4.0.15a/config.h.in 174,176d173 < /* Define if the system files define ushort */ < #undef HAVE_USHORT < diff -r mysql-4.0.15a/configure bkp/mysql-4.0.15a/configure 1638,1642d1637 < ### Sp.Raja LynxOS install does not support wildcard characters < if test "$target_os" = "lynxos"; then < INSTALL=$ac_install_sh < fi < ### End 9278,9282d9272 < #### Sp.Raja Added LynxOS < elif $PS -ax 2> /dev/null | grep bash > /dev/null < then < FIND_PROC="$PS -ax | grep mysqld | grep \" \$\$PID \" > /dev/null" < #### End 13481,13528d13470 < #### Added by Sp.Raja for LynxOS < rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext < echo "$as_me:$LINENO: result: \"$with_posix_threads\"" >&5 < echo "${ECHO_T}\"$with_posix_threads\"" >&6 < if test "$with_posix_threads" = "no" < then < # This is for LynxOS < LIBS="$ac_save_LIBS -mthreads" < TOOLS_LIBS="$ac_save_TOOLS_LIBS -mthreads" < echo "$as_me:$LINENO: checking \"for pthread_create in -mthreads\"" >&5 < echo $ECHO_N "checking \"for pthread_create in -mthreads\"... $ECHO_C" >&6; < cat >conftest.$ac_ext <<_ACEOF < #line $LINENO "configure" < #include "confdefs.h" < #include < #ifdef F77_DUMMY_MAIN < # ifdef __cplusplus < extern "C" < # endif < int F77_DUMMY_MAIN() { return 1; } < #endif < int < main () < { < pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); < ; < return 0; < } < _ACEOF < rm -f conftest.$ac_objext conftest$ac_exeext < if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 < (eval $ac_link) 2>&5 < ac_status=$? < echo "$as_me:$LINENO: \$? = $ac_status" >&5 < (exit $ac_status); } && < { ac_try='test -s conftest$ac_exeext' < { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 < (eval $ac_try) 2>&5 < ac_status=$? < echo "$as_me:$LINENO: \$? = $ac_status" >&5 < (exit $ac_status); }; }; then < with_posix_threads=yes < else < echo "$as_me: failed program was:" >&5 < cat conftest.$ac_ext >&5 < with_posix_threads=no < fi < ####End 13588,13590d13529 < ####Sp.Raja < fi < ####End 17624,17679d17562 < #### Sp.Raja LynxOS < # Do the system files define ushort < echo "$as_me:$LINENO: checking for type ushort" >&5 < echo $ECHO_N "checking for type ushort... $ECHO_C" >&6 < if test "${ac_cv_ushort+set}" = set; then < echo $ECHO_N "(cached) $ECHO_C" >&6 < else < if test "$cross_compiling" = yes; then < ac_cv_ushort=no < else < cat >conftest.$ac_ext <<_ACEOF < #line $LINENO "configure" < #include "confdefs.h" < #include < #include < main() < { < ushort foo; < foo++; < exit(0); < } < _ACEOF < rm -f conftest$ac_exeext < if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 < (eval $ac_link) 2>&5 < ac_status=$? < echo "$as_me:$LINENO: \$? = $ac_status" >&5 < (exit $ac_status); } && { ac_try='./conftest$ac_exeext' < { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 < (eval $ac_try) 2>&5 < ac_status=$? < echo "$as_me:$LINENO: \$? = $ac_status" >&5 < (exit $ac_status); }; }; then < ac_cv_ushort=yes < else < echo "$as_me: program exited with status $ac_status" >&5 < echo "$as_me: failed program was:" >&5 < cat conftest.$ac_ext >&5 < ( exit $ac_status ) < ac_cv_ushort=no < fi < rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext < fi < fi < < echo "$as_me:$LINENO: result: $ac_cv_ushort" >&5 < echo "${ECHO_T}$ac_cv_ushort" >&6 < if test "$ac_cv_ushort" = "yes" < then < cat >>confdefs.h <<\_ACEOF < #define HAVE_USHORT 1 < _ACEOF < < fi < #### End < 20055,20065d19937 < #### Sp.Raja Added Check for LynxOS < if test "$ac_func" = "poll"; then < if test "$target_os" = "lynxos"; then < echo "LynxOS has poll function, but it doesn't work in my version" < else < cat >>confdefs.h <<_ACEOF < #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 < _ACEOF < fi < else < #### End 20069,20071c19941 < #### Sp.Raja LynxOS < fi < #### End --- > diff -r mysql-4.0.15a/include/my_global.h bkp/mysql-4.0.15a/include/my_global.h 355,356d354 < #endif < #if defined(__EMX__) || !defined(HAVE_USHORT) 652,656c650 < #if 0 //Sp.Raja for LynxOS < #define ALIGN_SIZE(A) MY_ALIGN((A),sizeof(double)) < #else < #define ALIGN_SIZE(A) MY_ALIGN((A),4) < #endif --- > #define ALIGN_SIZE(A) MY_ALIGN((A),sizeof(double)) diff -r mysql-4.0.15a/include/my_pthread.h bkp/mysql-4.0.15a/include/my_pthread.h 291,293c291 < //#if defined(_BSDI_VERSION) && _BSDI_VERSION < 199910 < #if 1 < #if 0 //Sp.Raja LynxOS --- > #if defined(_BSDI_VERSION) && _BSDI_VERSION < 199910 295,297d292 < #else < int mysql_sigwait(sigset_t *set, int *sig); < #endif 306d300 < #if 0 //Sp.Raja LynxOS 308,310d301 < #else < #define my_sigwait(A,B) mysql_sigwait((A),(B)) < #endif diff -r mysql-4.0.15a/innobase/btr/btr0sea.c bkp/mysql-4.0.15a/innobase/btr/btr0sea.c 1552c1552 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 1558c1558 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); diff -r mysql-4.0.15a/innobase/buf/buf0buf.c bkp/mysql-4.0.15a/innobase/buf/buf0buf.c 478c478 < innobase_mutex_create(&(buf_pool->mutex)); --- > mutex_create(&(buf_pool->mutex)); 481c481 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 561c561 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 631c631 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 639c639 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 652c652 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 656c656 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 697c697 < innobase_mutex_enter_fast(&(buf_pool->mutex)); --- > mutex_enter_fast(&(buf_pool->mutex)); 701c701 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 718c718 < innobase_mutex_enter_fast(&(buf_pool->mutex)); --- > mutex_enter_fast(&(buf_pool->mutex)); 726c726 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 745c745 < innobase_mutex_enter_fast(&(buf_pool->mutex)); --- > mutex_enter_fast(&(buf_pool->mutex)); 755c755 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 797c797 < innobase_mutex_enter_fast(&(buf_pool->mutex)); --- > mutex_enter_fast(&(buf_pool->mutex)); 805c805 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 826c826 < innobase_mutex_enter_fast(&(buf_pool->mutex)); --- > mutex_enter_fast(&(buf_pool->mutex)); 834c834 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 874c874 < innobase_mutex_enter_fast(&(buf_pool->mutex)); --- > mutex_enter_fast(&(buf_pool->mutex)); 895c895 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 923c923 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 945c945 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 970c970 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 976c976 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 1042c1042 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 1046c1046 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 1064c1064 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 1079c1079 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 1085c1085 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 1100c1100 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 1106c1106 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 1166c1166 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 1176c1176 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 1190c1190 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 1205c1205 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 1211c1211 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 1369c1369 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 1375c1375 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 1408c1408 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 1441c1441 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 1452c1452 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 1486c1486 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 1611c1611 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 1653c1653 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 1694c1694 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 1698c1698 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 1720c1720 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 1788c1788 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 1820c1820 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 1875c1875 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 1920c1920 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 1928c1928 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 1955c1955 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 2015c2015 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 2044c2044 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 2061c2061 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 2077c2077 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 2087c2087 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 2101c2101 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 2105c2105 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); diff -r mysql-4.0.15a/innobase/buf/buf0flu.c bkp/mysql-4.0.15a/innobase/buf/buf0flu.c 216c216 < innobase_mutex_enter(&(trx_doublewrite->mutex)); --- > mutex_enter(&(trx_doublewrite->mutex)); 224c224 < innobase_mutex_exit(&(trx_doublewrite->mutex)); --- > mutex_exit(&(trx_doublewrite->mutex)); 308c308 < innobase_mutex_exit(&(trx_doublewrite->mutex)); --- > mutex_exit(&(trx_doublewrite->mutex)); 322c322 < innobase_mutex_enter(&(trx_doublewrite->mutex)); --- > mutex_enter(&(trx_doublewrite->mutex)); 326c326 < innobase_mutex_exit(&(trx_doublewrite->mutex)); --- > mutex_exit(&(trx_doublewrite->mutex)); 343c343 < innobase_mutex_exit(&(trx_doublewrite->mutex)); --- > mutex_exit(&(trx_doublewrite->mutex)); 350c350 < innobase_mutex_exit(&(trx_doublewrite->mutex)); --- > mutex_exit(&(trx_doublewrite->mutex)); 443c443 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 474c474 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 518c518 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 537c537 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 551c551 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 592c592 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 616c616 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 625c625 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 629c629 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 669c669 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 676c676 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 725c725 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 738c738 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 768c768 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 815c815 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 835c835 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 915c915 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 919c919 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); diff -r mysql-4.0.15a/innobase/buf/buf0lru.c bkp/mysql-4.0.15a/innobase/buf/buf0lru.c 78c78 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 85c85 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 94c94 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 118c118 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 136c136 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 140c140 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 160c160 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 174c174 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 192c192 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 196c196 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 200c200 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 203c203 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 222c222 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 272c272 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 284c284 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 329c329 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 336c336 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 340c340 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 705c705 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 760c760 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 776c776 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 820c820 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); diff -r mysql-4.0.15a/innobase/buf/buf0rea.c bkp/mysql-4.0.15a/innobase/buf/buf0rea.c 183c183 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 187c187 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 207c207 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 359c359 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 363c363 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 404c404 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 415c415 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 431c431 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); diff -r mysql-4.0.15a/innobase/com/com0shm.c bkp/mysql-4.0.15a/innobase/com/com0shm.c 486c486 < innobase_mutex_create(&com_shm_destination_mutex); --- > mutex_create(&com_shm_destination_mutex); 507c507 < ret = ip_innobase_mutex_enter(ep->ip_mutex, 10000000); --- > ret = ip_mutex_enter(ep->ip_mutex, 10000000); 524c524 < ip_innobase_mutex_exit(ep->ip_mutex); --- > ip_mutex_exit(ep->ip_mutex); 544c544 < innobase_mutex_enter(&com_shm_destination_mutex); --- > mutex_enter(&com_shm_destination_mutex); 550c550 < innobase_mutex_exit(&com_shm_destination_mutex); --- > mutex_exit(&com_shm_destination_mutex); 567c567 < innobase_mutex_enter(&com_shm_destination_mutex); --- > mutex_enter(&com_shm_destination_mutex); 578c578 < innobase_mutex_exit(&com_shm_destination_mutex); --- > mutex_exit(&com_shm_destination_mutex); 593c593 < innobase_mutex_enter(&com_shm_destination_mutex); --- > mutex_enter(&com_shm_destination_mutex); 596c596 < innobase_mutex_exit(&com_shm_destination_mutex); --- > mutex_exit(&com_shm_destination_mutex); 619c619 < innobase_mutex_exit(&com_shm_destination_mutex); --- > mutex_exit(&com_shm_destination_mutex); 640c640 < innobase_mutex_enter(&com_shm_destination_mutex); --- > mutex_enter(&com_shm_destination_mutex); 644c644 < innobase_mutex_exit(&com_shm_destination_mutex); --- > mutex_exit(&com_shm_destination_mutex); 898c898 < ret = ip_innobase_mutex_create(com_shm_get_ip_mutex(map), buf, &ip_hdl); --- > ret = ip_mutex_create(com_shm_get_ip_mutex(map), buf, &ip_hdl); 910c910 < innobase_mutex_enter(&com_shm_destination_mutex); --- > mutex_enter(&com_shm_destination_mutex); 916c916 < innobase_mutex_exit(&com_shm_destination_mutex); --- > mutex_exit(&com_shm_destination_mutex); diff -r mysql-4.0.15a/innobase/dict/dict0boot.c bkp/mysql-4.0.15a/innobase/dict/dict0boot.c 232c232 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 390c390 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); diff -r mysql-4.0.15a/innobase/dict/dict0crea.c bkp/mysql-4.0.15a/innobase/dict/dict0crea.c 1068c1068 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 1080c1080 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 1085c1085 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 1285c1285 < innobase_mutex_enter(&dict_foreign_err_mutex); --- > mutex_enter(&dict_foreign_err_mutex); 1290c1290 < innobase_mutex_exit(&dict_foreign_err_mutex); --- > mutex_exit(&dict_foreign_err_mutex); diff -r mysql-4.0.15a/innobase/dict/dict0dict.c bkp/mysql-4.0.15a/innobase/dict/dict0dict.c 243c243 < dict_innobase_mutex_enter_for_mysql(void) --- > dict_mutex_enter_for_mysql(void) 246c246 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 253c253 < dict_innobase_mutex_exit_for_mysql(void) --- > dict_mutex_exit_for_mysql(void) 256c256 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 267c267 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 273c273 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 336c336 < innobase_mutex_enter(&(table->autoinc_mutex)); --- > mutex_enter(&(table->autoinc_mutex)); 341c341 < innobase_mutex_exit(&(table->autoinc_mutex)); --- > mutex_exit(&(table->autoinc_mutex)); 356c356 < innobase_mutex_enter(&(table->autoinc_mutex)); --- > mutex_enter(&(table->autoinc_mutex)); 366c366 < innobase_mutex_exit(&(table->autoinc_mutex)); --- > mutex_exit(&(table->autoinc_mutex)); 379c379 < innobase_mutex_enter(&(table->autoinc_mutex)); --- > mutex_enter(&(table->autoinc_mutex)); 383c383 < innobase_mutex_exit(&(table->autoinc_mutex)); --- > mutex_exit(&(table->autoinc_mutex)); 398c398 < innobase_mutex_enter(&(table->autoinc_mutex)); --- > mutex_enter(&(table->autoinc_mutex)); 407c407 < innobase_mutex_exit(&(table->autoinc_mutex)); --- > mutex_exit(&(table->autoinc_mutex)); 445c445 < innobase_mutex_enter(&(table->autoinc_mutex)); --- > mutex_enter(&(table->autoinc_mutex)); 453c453 < innobase_mutex_exit(&(table->autoinc_mutex)); --- > mutex_exit(&(table->autoinc_mutex)); 600c600 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 604c604 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 633c633 < innobase_mutex_create(&(dict_sys->mutex)); --- > mutex_create(&(dict_sys->mutex)); 659c659 < innobase_mutex_create(&dict_foreign_err_mutex); --- > mutex_create(&dict_foreign_err_mutex); 679c679 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 683c683 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 708c708 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 717c717 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 1954c1954 < innobase_mutex_enter(&dict_foreign_err_mutex); --- > mutex_enter(&dict_foreign_err_mutex); 1971c1971 < innobase_mutex_exit(&dict_foreign_err_mutex); --- > mutex_exit(&dict_foreign_err_mutex); 1995c1995 < innobase_mutex_enter(&dict_foreign_err_mutex); --- > mutex_enter(&dict_foreign_err_mutex); 2012c2012 < innobase_mutex_exit(&dict_foreign_err_mutex); --- > mutex_exit(&dict_foreign_err_mutex); 2480c2480 < innobase_mutex_enter(&dict_foreign_err_mutex); --- > mutex_enter(&dict_foreign_err_mutex); 2489c2489 < innobase_mutex_exit(&dict_foreign_err_mutex); --- > mutex_exit(&dict_foreign_err_mutex); 2537c2537 < innobase_mutex_enter(&dict_foreign_err_mutex); --- > mutex_enter(&dict_foreign_err_mutex); 2544c2544 < innobase_mutex_exit(&dict_foreign_err_mutex); --- > mutex_exit(&dict_foreign_err_mutex); 2606c2606 < innobase_mutex_enter(&dict_foreign_err_mutex); --- > mutex_enter(&dict_foreign_err_mutex); 2613c2613 < innobase_mutex_exit(&dict_foreign_err_mutex); --- > mutex_exit(&dict_foreign_err_mutex); 2640c2640 < innobase_mutex_enter(&dict_foreign_err_mutex); --- > mutex_enter(&dict_foreign_err_mutex); 2649c2649 < innobase_mutex_exit(&dict_foreign_err_mutex); --- > mutex_exit(&dict_foreign_err_mutex); 2687c2687 < innobase_mutex_enter(&dict_foreign_err_mutex); --- > mutex_enter(&dict_foreign_err_mutex); 2694c2694 < innobase_mutex_exit(&dict_foreign_err_mutex); --- > mutex_exit(&dict_foreign_err_mutex); 2719c2719 < innobase_mutex_enter(&dict_foreign_err_mutex); --- > mutex_enter(&dict_foreign_err_mutex); 2726c2726 < innobase_mutex_exit(&dict_foreign_err_mutex); --- > mutex_exit(&dict_foreign_err_mutex); 2848c2848 < innobase_mutex_enter(&dict_foreign_err_mutex); --- > mutex_enter(&dict_foreign_err_mutex); 2855c2855 < innobase_mutex_exit(&dict_foreign_err_mutex); --- > mutex_exit(&dict_foreign_err_mutex); 2875c2875 < innobase_mutex_enter(&dict_foreign_err_mutex); --- > mutex_enter(&dict_foreign_err_mutex); 2882c2882 < innobase_mutex_exit(&dict_foreign_err_mutex); --- > mutex_exit(&dict_foreign_err_mutex); 2897c2897 < innobase_mutex_enter(&dict_foreign_err_mutex); --- > mutex_enter(&dict_foreign_err_mutex); 2907c2907 < innobase_mutex_exit(&dict_foreign_err_mutex); --- > mutex_exit(&dict_foreign_err_mutex); 3078c3078 < innobase_mutex_enter(&dict_foreign_err_mutex); --- > mutex_enter(&dict_foreign_err_mutex); 3085c3085 < innobase_mutex_exit(&dict_foreign_err_mutex); --- > mutex_exit(&dict_foreign_err_mutex); 3095c3095 < innobase_mutex_enter(&dict_foreign_err_mutex); --- > mutex_enter(&dict_foreign_err_mutex); 3101c3101 < innobase_mutex_exit(&dict_foreign_err_mutex); --- > mutex_exit(&dict_foreign_err_mutex); 3120c3120 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 3137c3137 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 3157c3157 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 3174c3174 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 3205c3205 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 3211c3211 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 3230c3230 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 3251c3251 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 3708c3708 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 3710c3710 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 3723c3723 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 3730c3730 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 3985c3985 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 3990c3990 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 4006c4006 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 4040c4040 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 4045c4045 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 4113c4113 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); diff -r mysql-4.0.15a/innobase/dict/dict0load.c bkp/mysql-4.0.15a/innobase/dict/dict0load.c 126c126 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 146c146 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 704c704 < innobase_mutex_enter(&dict_foreign_err_mutex); --- > mutex_enter(&dict_foreign_err_mutex); 716c716 < innobase_mutex_exit(&dict_foreign_err_mutex); --- > mutex_exit(&dict_foreign_err_mutex); diff -r mysql-4.0.15a/innobase/dict/dict0mem.c bkp/mysql-4.0.15a/innobase/dict/dict0mem.c 89c89 < innobase_mutex_create(&(table->autoinc_mutex)); --- > mutex_create(&(table->autoinc_mutex)); diff -r mysql-4.0.15a/innobase/fil/fil0fil.c bkp/mysql-4.0.15a/innobase/fil/fil0fil.c 170c170 < innobase_mutex_enter(&(fil_system->mutex)); --- > mutex_enter(&(fil_system->mutex)); 178c178 < innobase_mutex_exit(&(fil_system->mutex)); --- > mutex_exit(&(fil_system->mutex)); 187c187 < innobase_mutex_exit(&(fil_system->mutex)); --- > mutex_exit(&(fil_system->mutex)); 197c197 < innobase_mutex_enter(&(fil_system->mutex)); --- > mutex_enter(&(fil_system->mutex)); 206c206 < innobase_mutex_exit(&(fil_system->mutex)); --- > mutex_exit(&(fil_system->mutex)); 223c223 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 227c227 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 246c246 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 250c250 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 269c269 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 273c273 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 298c298 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 320c320 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 390c390 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 407c407 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 427c427 < innobase_mutex_create(&(system->mutex)); --- > mutex_create(&(system->mutex)); 522c522 < innobase_mutex_enter(&(fil_system->mutex)); --- > mutex_enter(&(fil_system->mutex)); 533c533 < innobase_mutex_exit(&(fil_system->mutex)); --- > mutex_exit(&(fil_system->mutex)); 544c544 < innobase_mutex_enter(&(fil_system->mutex)); --- > mutex_enter(&(fil_system->mutex)); 555c555 < innobase_mutex_exit(&(fil_system->mutex)); --- > mutex_exit(&(fil_system->mutex)); 637c637 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 664c664 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 680c680 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 703c703 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 724c724 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 730c730 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 753c753 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 771c771 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 793c793 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 804c804 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 823c823 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 831c831 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 849c849 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 857c857 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 1003c1003 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 1043c1043 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 1139c1139 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 1148c1148 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 1173c1173 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 1220c1220 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 1245c1245 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 1249c1249 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 1347c1347 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 1351c1351 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 1381c1381 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 1401c1401 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 1413c1413 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 1425c1425 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 1440c1440 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 1446c1446 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 1450c1450 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 1456c1456 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); 1475c1475 < innobase_mutex_enter(&(system->mutex)); --- > mutex_enter(&(system->mutex)); 1518c1518 < innobase_mutex_exit(&(system->mutex)); --- > mutex_exit(&(system->mutex)); diff -r mysql-4.0.15a/innobase/ha/hash0hash.c bkp/mysql-4.0.15a/innobase/ha/hash0hash.c 20c20 < hash_innobase_mutex_enter( --- > hash_mutex_enter( 25c25 < innobase_mutex_enter(hash_get_mutex(table, fold)); --- > mutex_enter(hash_get_mutex(table, fold)); 32c32 < hash_innobase_mutex_exit( --- > hash_mutex_exit( 37c37 < innobase_mutex_exit(hash_get_mutex(table, fold)); --- > mutex_exit(hash_get_mutex(table, fold)); 44c44 < hash_innobase_mutex_enter_all( --- > hash_mutex_enter_all( 52c52 < innobase_mutex_enter(table->mutexes + i); --- > mutex_enter(table->mutexes + i); 60c60 < hash_innobase_mutex_exit_all( --- > hash_mutex_exit_all( 68c68 < innobase_mutex_exit(table->mutexes + i); --- > mutex_exit(table->mutexes + i); 146c146 < innobase_mutex_create(table->mutexes + i); --- > mutex_create(table->mutexes + i); diff -r mysql-4.0.15a/innobase/ibuf/ibuf0ibuf.c bkp/mysql-4.0.15a/innobase/ibuf/ibuf0ibuf.c 348c348 < innobase_mutex_create(&ibuf_pessimistic_insert_mutex); --- > mutex_create(&ibuf_pessimistic_insert_mutex); 352c352 < innobase_mutex_create(&ibuf_mutex); --- > mutex_create(&ibuf_mutex); 356c356 < innobase_mutex_create(&ibuf_bitmap_mutex); --- > mutex_create(&ibuf_bitmap_mutex); 442c442 < innobase_mutex_enter(&ibuf_mutex); --- > mutex_enter(&ibuf_mutex); 467c467 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); 498c498 < innobase_mutex_enter(&ibuf_mutex); --- > mutex_enter(&ibuf_mutex); 502c502 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); 871c871 < innobase_mutex_enter(&ibuf_bitmap_mutex); --- > mutex_enter(&ibuf_bitmap_mutex); 881c881 < innobase_mutex_exit(&ibuf_bitmap_mutex); --- > mutex_exit(&ibuf_bitmap_mutex); 1289c1289 < innobase_mutex_enter(&ibuf_mutex); --- > mutex_enter(&ibuf_mutex); 1313c1313 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); 1346c1346 < innobase_mutex_enter(&ibuf_pessimistic_insert_mutex); --- > mutex_enter(&ibuf_pessimistic_insert_mutex); 1350c1350 < innobase_mutex_enter(&ibuf_mutex); --- > mutex_enter(&ibuf_mutex); 1354c1354 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); 1358c1358 < innobase_mutex_exit(&ibuf_pessimistic_insert_mutex); --- > mutex_exit(&ibuf_pessimistic_insert_mutex); 1378c1378 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); 1395c1395 < innobase_mutex_enter(&ibuf_mutex); --- > mutex_enter(&ibuf_mutex); 1415c1415 < innobase_mutex_exit(&ibuf_pessimistic_insert_mutex); --- > mutex_exit(&ibuf_pessimistic_insert_mutex); 1429c1429 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); 1472c1472 < innobase_mutex_enter(&ibuf_mutex); --- > mutex_enter(&ibuf_mutex); 1476c1476 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); 1481c1481 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); 1658c1658 < innobase_mutex_enter(&ibuf_mutex); --- > mutex_enter(&ibuf_mutex); 1687c1687 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); 1720c1720 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); 1725c1725 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); 1812c1812 < innobase_mutex_enter(&ibuf_mutex); --- > mutex_enter(&ibuf_mutex); 1815c1815 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); 1827c1827 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); 2041c2041 < innobase_mutex_enter(&ibuf_mutex); --- > mutex_enter(&ibuf_mutex); 2047c2047 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); 2058c2058 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); 2061c2061 < innobase_mutex_enter(&ibuf_pessimistic_insert_mutex); --- > mutex_enter(&ibuf_pessimistic_insert_mutex); 2065c2065 < innobase_mutex_enter(&ibuf_mutex); --- > mutex_enter(&ibuf_mutex); 2069c2069 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); 2073c2073 < innobase_mutex_exit(&ibuf_pessimistic_insert_mutex); --- > mutex_exit(&ibuf_pessimistic_insert_mutex); 2082c2082 < innobase_mutex_enter(&ibuf_pessimistic_insert_mutex); --- > mutex_enter(&ibuf_pessimistic_insert_mutex); 2086c2086 < innobase_mutex_enter(&ibuf_mutex); --- > mutex_enter(&ibuf_mutex); 2210,2211c2210,2211 < innobase_mutex_exit(&ibuf_mutex); < innobase_mutex_exit(&ibuf_pessimistic_insert_mutex); --- > mutex_exit(&ibuf_mutex); > mutex_exit(&ibuf_pessimistic_insert_mutex); 2220c2220 < innobase_mutex_enter(&ibuf_mutex); --- > mutex_enter(&ibuf_mutex); 2227c2227 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); 2411c2411 < innobase_mutex_enter(&ibuf_mutex); --- > mutex_enter(&ibuf_mutex); 2460c2460 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); 2715c2715 < innobase_mutex_enter(&ibuf_mutex); --- > mutex_enter(&ibuf_mutex); 2720c2720 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); 2773c2773 < innobase_mutex_enter(&ibuf_mutex); --- > mutex_enter(&ibuf_mutex); 2797c2797 < innobase_mutex_exit(&ibuf_mutex); --- > mutex_exit(&ibuf_mutex); diff -r mysql-4.0.15a/innobase/include/buf0buf.ic bkp/mysql-4.0.15a/innobase/include/buf0buf.ic 108c108 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 118c118 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 411c411 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 417c417 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 422c422 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 444c444 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 452c452 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 621c621 < innobase_mutex_enter_fast(&(buf_pool->mutex)); --- > mutex_enter_fast(&(buf_pool->mutex)); 637c637 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); diff -r mysql-4.0.15a/innobase/include/buf0flu.ic bkp/mysql-4.0.15a/innobase/include/buf0flu.ic 81c81 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 99c99 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); diff -r mysql-4.0.15a/innobase/include/dict0boot.ic bkp/mysql-4.0.15a/innobase/include/dict0boot.ic 28c28 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 39c39 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); diff -r mysql-4.0.15a/innobase/include/dict0dict.h bkp/mysql-4.0.15a/innobase/include/dict0dict.h 853c853 < dict_innobase_mutex_enter_for_mysql(void); --- > dict_mutex_enter_for_mysql(void); 859c859 < dict_innobase_mutex_exit_for_mysql(void); --- > dict_mutex_exit_for_mysql(void); diff -r mysql-4.0.15a/innobase/include/dict0dict.ic bkp/mysql-4.0.15a/innobase/include/dict0dict.ic 595c595 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 606c606 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 655c655 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 659c659 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); diff -r mysql-4.0.15a/innobase/include/ha0ha.ic bkp/mysql-4.0.15a/innobase/include/ha0ha.ic 263c263 < hash_innobase_mutex_enter(table, fold); --- > hash_mutex_enter(table, fold); 267c267 < hash_innobase_mutex_exit(table, fold); --- > hash_mutex_exit(table, fold); diff -r mysql-4.0.15a/innobase/include/hash0hash.h bkp/mysql-4.0.15a/innobase/include/hash0hash.h 291c291 < hash_innobase_mutex_enter( --- > hash_mutex_enter( 299c299 < hash_innobase_mutex_exit( --- > hash_mutex_exit( 307c307 < hash_innobase_mutex_enter_all( --- > hash_mutex_enter_all( 314c314 < hash_innobase_mutex_exit_all( --- > hash_mutex_exit_all( diff -r mysql-4.0.15a/innobase/include/log0log.ic bkp/mysql-4.0.15a/innobase/include/log0log.ic 311c311 < innobase_mutex_enter(&(log->mutex)); --- > mutex_enter(&(log->mutex)); 323c323 < innobase_mutex_exit(&(log->mutex)); --- > mutex_exit(&(log->mutex)); 361c361 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 374c374 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 378c378 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); diff -r mysql-4.0.15a/innobase/include/mem0mem.ic bkp/mysql-4.0.15a/innobase/include/mem0mem.ic 270c270 < innobase_mutex_enter(&mem_hash_mutex); --- > mutex_enter(&mem_hash_mutex); 272c272 < innobase_mutex_exit(&mem_hash_mutex); --- > mutex_exit(&mem_hash_mutex); diff -r mysql-4.0.15a/innobase/include/mem0pool.h bkp/mysql-4.0.15a/innobase/include/mem0pool.h 78c78 < mem_pool_innobase_mutex_enter(void); --- > mem_pool_mutex_enter(void); 84c84 < mem_pool_innobase_mutex_exit(void); --- > mem_pool_mutex_exit(void); diff -r mysql-4.0.15a/innobase/include/os0sync.h bkp/mysql-4.0.15a/innobase/include/os0sync.h 172c172 < os_innobase_mutex_create( --- > os_mutex_create( 181c181 < os_innobase_mutex_enter( --- > os_mutex_enter( 188c188 < os_innobase_mutex_exit( --- > os_mutex_exit( diff -r mysql-4.0.15a/innobase/include/sync0arr.h bkp/mysql-4.0.15a/innobase/include/sync0arr.h 91c91 < this function will do the waking (see the comment in innobase_mutex_exit). This --- > this function will do the waking (see the comment in mutex_exit). This diff -r mysql-4.0.15a/innobase/include/sync0ipm.h bkp/mysql-4.0.15a/innobase/include/sync0ipm.h 50c50 < ip_innobase_mutex_create( --- > ip_mutex_create( 61c61 < on ip_innobase_mutex_create. Destroys an ip mutex */ --- > on ip_mutex_create. Destroys an ip mutex */ 91c91 < ip_innobase_mutex_enter( --- > ip_mutex_enter( 103c103 < ip_innobase_mutex_exit( --- > ip_mutex_exit( diff -r mysql-4.0.15a/innobase/include/sync0ipm.ic bkp/mysql-4.0.15a/innobase/include/sync0ipm.ic 68c68 < ip_innobase_mutex_enter( --- > ip_mutex_enter( 95c95 < if (innobase_mutex_enter_nowait(mutex, IB__FILE__, __LINE__) == 0) { --- > if (mutex_enter_nowait(mutex, IB__FILE__, __LINE__) == 0) { 108c108 < if (innobase_mutex_enter_nowait(mutex, IB__FILE__, __LINE__) == 0) { --- > if (mutex_enter_nowait(mutex, IB__FILE__, __LINE__) == 0) { 126c126 < os_innobase_mutex_enter(exclude); --- > os_mutex_enter(exclude); 128c128 < os_innobase_mutex_exit(exclude); --- > os_mutex_exit(exclude); 143c143 < ip_innobase_mutex_exit( --- > ip_mutex_exit( 158c158 < innobase_mutex_exit(mutex); --- > mutex_exit(mutex); 168c168 < os_innobase_mutex_enter(exclude); --- > os_mutex_enter(exclude); 180c180 < os_innobase_mutex_exit(exclude); --- > os_mutex_exit(exclude); diff -r mysql-4.0.15a/innobase/include/sync0rw.h bkp/mysql-4.0.15a/innobase/include/sync0rw.h 375c375 < mutex protecting the sync array, and the ordinary innobase_mutex_enter might --- > mutex protecting the sync array, and the ordinary mutex_enter might 380c380 < rw_lock_debug_innobase_mutex_enter(void); --- > rw_lock_debug_mutex_enter(void); 386c386 < rw_lock_debug_innobase_mutex_exit(void); --- > rw_lock_debug_mutex_exit(void); diff -r mysql-4.0.15a/innobase/include/sync0rw.ic bkp/mysql-4.0.15a/innobase/include/sync0rw.ic 241c241 < innobase_mutex_enter(rw_lock_get_mutex(lock)); --- > mutex_enter(rw_lock_get_mutex(lock)); 244c244 < innobase_mutex_exit(rw_lock_get_mutex(lock)); --- > mutex_exit(rw_lock_get_mutex(lock)); 249c249 < innobase_mutex_exit(rw_lock_get_mutex(lock)); --- > mutex_exit(rw_lock_get_mutex(lock)); 272c272 < innobase_mutex_enter(rw_lock_get_mutex(lock)); --- > mutex_enter(rw_lock_get_mutex(lock)); 289c289 < innobase_mutex_exit(rw_lock_get_mutex(lock)); --- > mutex_exit(rw_lock_get_mutex(lock)); 309c309 < innobase_mutex_enter(rw_lock_get_mutex(lock)); --- > mutex_enter(rw_lock_get_mutex(lock)); 333c333 < innobase_mutex_exit(rw_lock_get_mutex(lock)); --- > mutex_exit(rw_lock_get_mutex(lock)); 357c357 < innobase_mutex_enter(mutex); --- > mutex_enter(mutex); 377c377 < innobase_mutex_exit(mutex); --- > mutex_exit(mutex); 432c432 < innobase_mutex_enter(&(lock->mutex)); --- > mutex_enter(&(lock->mutex)); 456c456 < innobase_mutex_exit(&(lock->mutex)); --- > mutex_exit(&(lock->mutex)); diff -r mysql-4.0.15a/innobase/include/sync0sync.h bkp/mysql-4.0.15a/innobase/include/sync0sync.h 39c39 < #define innobase_mutex_create(M) innobase_mutex_create_func((M), IB__FILE__, __LINE__) --- > #define mutex_create(M) mutex_create_func((M), IB__FILE__, __LINE__) 48c48 < innobase_mutex_create_func( --- > mutex_create_func( 67c67 < #define innobase_mutex_enter(M) innobase_mutex_enter_func((M), IB__FILE__, __LINE__) --- > #define mutex_enter(M) mutex_enter_func((M), IB__FILE__, __LINE__) 72c72 < /* NOTE! currently same as innobase_mutex_enter! */ --- > /* NOTE! currently same as mutex_enter! */ 74,75c74,75 < #define innobase_mutex_enter_fast(M) innobase_mutex_enter_func((M), IB__FILE__, __LINE__) < #define innobase_mutex_enter_fast_func innobase_mutex_enter_func; --- > #define mutex_enter_fast(M) mutex_enter_func((M), IB__FILE__, __LINE__) > #define mutex_enter_fast_func mutex_enter_func; 83c83 < innobase_mutex_enter_func( --- > mutex_enter_func( 93c93 < innobase_mutex_enter_nowait( --- > mutex_enter_nowait( 104c104 < innobase_mutex_exit( --- > mutex_exit( 490c490 < extern ulint innobase_mutex_exit_count; --- > extern ulint mutex_exit_count; diff -r mysql-4.0.15a/innobase/include/sync0sync.ic bkp/mysql-4.0.15a/innobase/include/sync0sync.ic 199c199 < innobase_mutex_exit( --- > mutex_exit( 230c230 < innobase_mutex_exit_count++; --- > mutex_exit_count++; 240c240 < innobase_mutex_enter_func( --- > mutex_enter_func( diff -r mysql-4.0.15a/innobase/include/univ.i bkp/mysql-4.0.15a/innobase/include/univ.i 149,154d148 < //Sp.Raja inline causing compilation problems with debug on LynxOS < #undef UNIV_NONINL < #undef UNIV_INLINE < #define UNIV_NONINL < #define UNIV_INLINE < diff -r mysql-4.0.15a/innobase/include/univold.i bkp/mysql-4.0.15a/innobase/include/univold.i 85,89d84 < //Sp.Raja inline causing compilation problems with debug on LynxOS < #undef UNIV_NONINL < #undef UNIV_INLINE < #define UNIV_NONINL < #define UNIV_INLINE diff -r mysql-4.0.15a/innobase/include/univoldmysql.i bkp/mysql-4.0.15a/innobase/include/univoldmysql.i 29c29 < in innobase_mutex_exit is performed using a serializing instruction, which does not --- > in mutex_exit is performed using a serializing instruction, which does not 92,97d91 < < //Sp.Raja inline causing compilation problems with debug on LynxOS < #undef UNIV_NONINL < #undef UNIV_INLINE < #define UNIV_NONINL < #define UNIV_INLINE diff -r mysql-4.0.15a/innobase/lock/lock0lock.c bkp/mysql-4.0.15a/innobase/lock/lock0lock.c 348c348 < lock_innobase_mutex_enter_kernel(void) --- > lock_mutex_enter_kernel(void) 351c351 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 360c360 < lock_innobase_mutex_exit_kernel(void) --- > lock_mutex_exit_kernel(void) 363c363 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 383c383 < lock_rec_innobase_mutex_enter( --- > lock_rec_mutex_enter( 387c387 < innobase_mutex_enter(lock_rec_get_mutex(ptr)); --- > mutex_enter(lock_rec_get_mutex(ptr)); 394c394 < lock_rec_innobase_mutex_exit( --- > lock_rec_mutex_exit( 398c398 < innobase_mutex_exit(lock_rec_get_mutex(ptr)); --- > mutex_exit(lock_rec_get_mutex(ptr)); 445c445 < lock_rec_innobase_mutex_enter_all(void) --- > lock_rec_mutex_enter_all(void) 458c458 < innobase_mutex_enter(hash_get_nth_mutex(table, i)); --- > mutex_enter(hash_get_nth_mutex(table, i)); 466c466 < lock_rec_innobase_mutex_exit_all(void) --- > lock_rec_mutex_exit_all(void) 479c479 < innobase_mutex_exit(hash_get_nth_mutex(table, i)); --- > mutex_exit(hash_get_nth_mutex(table, i)); 530c530 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 554c554 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 1190c1190 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 1198c1198 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 2431c2431 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 2436c2436 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 2519c2519 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 2546c2546 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 2602c2602 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 2632c2632 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 2677c2677 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 2694c2694 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 2708c2708 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 2722c2722 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 2737c2737 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 2754c2754 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 2761c2761 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 2774c2774 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 2783c2783 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 2795c2795 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 2803c2803 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 2818c2818 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 2843c2843 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 2856c2856 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 2862c2862 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 2876c2876 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 2881c2881 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 2908c2908 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 2919c2919 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 2926c2926 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 2937c2937 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 2947c2947 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 2969c2969 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 2973c2973 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 2988c2988 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 2992c2992 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 3490c3490 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 3496c3496 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 3511c3511 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 3518c3518 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 3536c3536 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 3544c3544 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 3629c3629 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 3633c3633 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 3686c3686 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 3688c3688 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 3778c3778 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 3790c3790 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 4000c4000 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 4012c4012 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 4022c4022 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 4056c4056 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 4088c4088 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 4096c4096 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 4109c4109 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 4166c4166 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 4177c4177 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 4187c4187 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 4273c4273 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 4297c4297 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 4359c4359 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 4390c4390 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 4420c4420 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 4424c4424 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 4438c4438 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 4460c4460 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 4507c4507 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 4511c4511 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 4517c4517 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 4562c4562 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 4571c4571 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 4606c4606 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 4687c4687 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 4698c4698 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 4737c4737 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 4743c4743 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 4789c4789 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 4810c4810 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); 4854c4854 < lock_innobase_mutex_enter_kernel(); --- > lock_mutex_enter_kernel(); 4868c4868 < lock_innobase_mutex_exit_kernel(); --- > lock_mutex_exit_kernel(); diff -r mysql-4.0.15a/innobase/log/log0log.c bkp/mysql-4.0.15a/innobase/log/log0log.c 118c118 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 122c122 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 173c173 < innobase_mutex_enter(&(log->mutex)); --- > mutex_enter(&(log->mutex)); 182c182 < innobase_mutex_exit(&(log->mutex)); --- > mutex_exit(&(log->mutex)); 206c206 < innobase_mutex_exit(&(log->mutex)); --- > mutex_exit(&(log->mutex)); 594c594 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 660c660 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 681c681 < innobase_mutex_create(&(log_sys->mutex)); --- > mutex_create(&(log_sys->mutex)); 684c684 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 778c778 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 1006c1006 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 1019c1019 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 1232c1232 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 1237c1237 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 1247c1247 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 1271c1271 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 1285c1285 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 1356c1356 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 1372c1372 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 1387c1387 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 1392c1392 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 1412c1412 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 1416c1416 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 1433c1433 < innobase_mutex_enter(&(log->mutex)); --- > mutex_enter(&(log->mutex)); 1446c1446 < innobase_mutex_exit(&(log->mutex)); --- > mutex_exit(&(log->mutex)); 1524c1524 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 1538c1538 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 1808c1808 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 1812c1812 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 1824c1824 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 1829c1829 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 1839c1839 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 1861c1861 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 1932c1932 < innobase_mutex_enter(&(log->mutex)); --- > mutex_enter(&(log->mutex)); 1935c1935 < innobase_mutex_exit(&(log->mutex)); --- > mutex_exit(&(log->mutex)); 1985c1985 < innobase_mutex_exit(&(log->mutex)); --- > mutex_exit(&(log->mutex)); 1997c1997 < innobase_mutex_enter(&(log->mutex)); --- > mutex_enter(&(log->mutex)); 2001c2001 < innobase_mutex_exit(&(log->mutex)); --- > mutex_exit(&(log->mutex)); 2427c2427 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 2431c2431 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2435c2435 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 2443c2443 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2464c2464 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 2467c2467 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2476c2476 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2480c2480 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 2504c2504 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2513c2513 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2525c2525 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2557c2557 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2580c2580 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 2583c2583 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2590c2590 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2595c2595 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 2599c2599 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2604c2604 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2668c2668 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 2672c2672 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2679c2679 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2683c2683 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 2688c2688 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2695c2695 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 2702c2702 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2713c2713 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 2717c2717 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2730c2730 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 2734c2734 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2743c2743 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2757c2757 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 2766c2766 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2771c2771 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2788c2788 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 2796c2796 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2801c2801 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2820c2820 < innobase_mutex_enter(&(log->mutex)); --- > mutex_enter(&(log->mutex)); 2823c2823 < innobase_mutex_exit(&(log->mutex)); --- > mutex_exit(&(log->mutex)); 2844c2844 < innobase_mutex_exit(&(log->mutex)); --- > mutex_exit(&(log->mutex)); 2849c2849 < innobase_mutex_exit(&(log->mutex)); --- > mutex_exit(&(log->mutex)); 2877c2877 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 2881c2881 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2886c2886 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2899c2899 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 2905c2905 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2916c2916 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2931c2931 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 2937c2937 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2944c2944 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2973c2973 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 2979c2979 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 2988c2988 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 2993c2993 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 2995c2995 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 3001c3001 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 3006c3006 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 3016c3016 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 3026c3026 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 3041c3041 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 3043c3043 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 3049c3049 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 3053c3053 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 3159c3159 < if (0 == innobase_mutex_enter_nowait(&(log_sys->mutex), (char*)__FILE__, --- > if (0 == mutex_enter_nowait(&(log_sys->mutex), (char*)__FILE__, 3163c3163 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 3188c3188 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 3215c3215 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); diff -r mysql-4.0.15a/innobase/log/log0recv.c bkp/mysql-4.0.15a/innobase/log/log0recv.c 96c96 < innobase_mutex_create(&(recv_sys->mutex)); --- > mutex_create(&(recv_sys->mutex)); 118c118 < innobase_mutex_enter(&(recv_sys->mutex)); --- > mutex_enter(&(recv_sys->mutex)); 145c145 < innobase_mutex_exit(&(recv_sys->mutex)); --- > mutex_exit(&(recv_sys->mutex)); 177c177 < innobase_mutex_enter(&(recv_sys->mutex)); --- > mutex_enter(&(recv_sys->mutex)); 187c187 < innobase_mutex_exit(&(recv_sys->mutex)); --- > mutex_exit(&(recv_sys->mutex)); 399c399 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 405c405 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 998c998 < innobase_mutex_enter(&(recv_sys->mutex)); --- > mutex_enter(&(recv_sys->mutex)); 1004c1004 < innobase_mutex_exit(&(recv_sys->mutex)); --- > mutex_exit(&(recv_sys->mutex)); 1015c1015 < innobase_mutex_exit(&(recv_sys->mutex)); --- > mutex_exit(&(recv_sys->mutex)); 1022c1022 < innobase_mutex_exit(&(recv_sys->mutex)); --- > mutex_exit(&(recv_sys->mutex)); 1135c1135 < innobase_mutex_enter(&(recv_sys->mutex)); --- > mutex_enter(&(recv_sys->mutex)); 1146c1146 < innobase_mutex_exit(&(recv_sys->mutex)); --- > mutex_exit(&(recv_sys->mutex)); 1188c1188 < innobase_mutex_enter(&(recv_sys->mutex)); --- > mutex_enter(&(recv_sys->mutex)); 1198c1198 < innobase_mutex_exit(&(recv_sys->mutex)); --- > mutex_exit(&(recv_sys->mutex)); 1235c1235 < innobase_mutex_enter(&(recv_sys->mutex)); --- > mutex_enter(&(recv_sys->mutex)); 1239c1239 < innobase_mutex_exit(&(recv_sys->mutex)); --- > mutex_exit(&(recv_sys->mutex)); 1274c1274 < innobase_mutex_exit(&(recv_sys->mutex)); --- > mutex_exit(&(recv_sys->mutex)); 1292c1292 < innobase_mutex_enter(&(recv_sys->mutex)); --- > mutex_enter(&(recv_sys->mutex)); 1313c1313 < innobase_mutex_exit(&(recv_sys->mutex)); --- > mutex_exit(&(recv_sys->mutex)); 1317c1317 < innobase_mutex_enter(&(recv_sys->mutex)); --- > mutex_enter(&(recv_sys->mutex)); 1329,1330c1329,1330 < innobase_mutex_exit(&(recv_sys->mutex)); < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(recv_sys->mutex)); > mutex_exit(&(log_sys->mutex)); 1340,1341c1340,1341 < innobase_mutex_enter(&(log_sys->mutex)); < innobase_mutex_enter(&(recv_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); > mutex_enter(&(recv_sys->mutex)); 1355c1355 < innobase_mutex_exit(&(recv_sys->mutex)); --- > mutex_exit(&(recv_sys->mutex)); 1567c1567 < innobase_mutex_enter(&(buf_pool->mutex)); --- > mutex_enter(&(buf_pool->mutex)); 1571c1571 < innobase_mutex_exit(&(buf_pool->mutex)); --- > mutex_exit(&(buf_pool->mutex)); 1666c1666 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 1670c1670 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2462c2462 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 2470c2470 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2566c2566 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2578c2578 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2649c2649 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2690c2690 < innobase_mutex_enter(&(recv_sys->mutex)); --- > mutex_enter(&(recv_sys->mutex)); 2694c2694 < innobase_mutex_exit(&(recv_sys->mutex)); --- > mutex_exit(&(recv_sys->mutex)); 2696c2696 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2810c2810 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 2817c2817 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 3145c3145 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 3170c3170 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 3181c3181 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 3191c3191 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); diff -r mysql-4.0.15a/innobase/mem/mem0dbg.c bkp/mysql-4.0.15a/innobase/mem/mem0dbg.c 125c125 < innobase_mutex_create(&mem_hash_mutex); --- > mutex_create(&mem_hash_mutex); 169c169 < innobase_mutex_enter(&mem_hash_mutex); --- > mutex_enter(&mem_hash_mutex); 179c179 < innobase_mutex_exit(&mem_hash_mutex); --- > mutex_exit(&mem_hash_mutex); 200c200 < innobase_mutex_enter(&mem_hash_mutex); --- > mutex_enter(&mem_hash_mutex); 202c202 < innobase_mutex_exit(&mem_hash_mutex); --- > mutex_exit(&mem_hash_mutex); 272c272 < innobase_mutex_enter(&mem_hash_mutex); --- > mutex_enter(&mem_hash_mutex); 291c291 < innobase_mutex_exit(&mem_hash_mutex); --- > mutex_exit(&mem_hash_mutex); 317c317 < innobase_mutex_enter(&mem_hash_mutex); --- > mutex_enter(&mem_hash_mutex); 371c371 < innobase_mutex_exit(&mem_hash_mutex); --- > mutex_exit(&mem_hash_mutex); 628c628 < innobase_mutex_enter(&mem_hash_mutex); --- > mutex_enter(&mem_hash_mutex); 677c677 < innobase_mutex_exit(&mem_hash_mutex); --- > mutex_exit(&mem_hash_mutex); 725c725 < innobase_mutex_enter(&mem_hash_mutex); --- > mutex_enter(&mem_hash_mutex); 736c736 < innobase_mutex_exit(&mem_hash_mutex); --- > mutex_exit(&mem_hash_mutex); 778c778 < innobase_mutex_enter(&mem_hash_mutex); --- > mutex_enter(&mem_hash_mutex); 796c796 < innobase_mutex_exit(&mem_hash_mutex); --- > mutex_exit(&mem_hash_mutex); 822c822 < innobase_mutex_exit(&mem_hash_mutex); --- > mutex_exit(&mem_hash_mutex); diff -r mysql-4.0.15a/innobase/mem/mem0mem.c bkp/mysql-4.0.15a/innobase/mem/mem0mem.c 182c182 < mem_pool_innobase_mutex_enter(); --- > mem_pool_mutex_enter(); 191c191 < mem_pool_innobase_mutex_exit(); --- > mem_pool_mutex_exit(); 286c286 < mem_pool_innobase_mutex_enter(); --- > mem_pool_mutex_enter(); 290c290 < mem_pool_innobase_mutex_exit(); --- > mem_pool_mutex_exit(); 349c349 < mem_pool_innobase_mutex_enter(); --- > mem_pool_mutex_enter(); 361c361 < mem_pool_innobase_mutex_exit(); --- > mem_pool_mutex_exit(); diff -r mysql-4.0.15a/innobase/mem/mem0pool.c bkp/mysql-4.0.15a/innobase/mem/mem0pool.c 112c112 < mem_pool_innobase_mutex_enter(void) --- > mem_pool_mutex_enter(void) 115c115 < innobase_mutex_enter(&(mem_comm_pool->mutex)); --- > mutex_enter(&(mem_comm_pool->mutex)); 122c122 < mem_pool_innobase_mutex_exit(void) --- > mem_pool_mutex_exit(void) 125c125 < innobase_mutex_exit(&(mem_comm_pool->mutex)); --- > mutex_exit(&(mem_comm_pool->mutex)); 207c207 < innobase_mutex_create(&(pool->mutex)); --- > mutex_create(&(pool->mutex)); 336c336 < innobase_mutex_enter(&(pool->mutex)); --- > mutex_enter(&(pool->mutex)); 351c351 < innobase_mutex_exit(&(pool->mutex)); --- > mutex_exit(&(pool->mutex)); 398c398 < innobase_mutex_exit(&(pool->mutex)); --- > mutex_exit(&(pool->mutex)); 518c518 < innobase_mutex_enter(&(pool->mutex)); --- > mutex_enter(&(pool->mutex)); 546c546 < innobase_mutex_exit(&(pool->mutex)); --- > mutex_exit(&(pool->mutex)); 562c562 < innobase_mutex_exit(&(pool->mutex)); --- > mutex_exit(&(pool->mutex)); 581c581 < innobase_mutex_enter(&(pool->mutex)); --- > mutex_enter(&(pool->mutex)); 608c608 < innobase_mutex_exit(&(pool->mutex)); --- > mutex_exit(&(pool->mutex)); 628c628 < innobase_mutex_enter(&(pool->mutex)); --- > mutex_enter(&(pool->mutex)); 642c642 < innobase_mutex_exit(&(pool->mutex)); --- > mutex_exit(&(pool->mutex)); 656c656 < innobase_mutex_enter(&(pool->mutex)); --- > mutex_enter(&(pool->mutex)); 660c660 < innobase_mutex_exit(&(pool->mutex)); --- > mutex_exit(&(pool->mutex)); diff -r mysql-4.0.15a/innobase/os/os0file.c bkp/mysql-4.0.15a/innobase/os/os0file.c 370c370 < os_file_count_mutex = os_innobase_mutex_create(NULL); --- > os_file_count_mutex = os_mutex_create(NULL); 373c373 < os_file_seek_mutexes[i] = os_innobase_mutex_create(NULL); --- > os_file_seek_mutexes[i] = os_mutex_create(NULL); 1098c1098 < os_innobase_mutex_enter(os_file_count_mutex); --- > os_mutex_enter(os_file_count_mutex); 1100c1100 < os_innobase_mutex_exit(os_file_count_mutex); --- > os_mutex_exit(os_file_count_mutex); 1104c1104 < os_innobase_mutex_enter(os_file_count_mutex); --- > os_mutex_enter(os_file_count_mutex); 1106c1106 < os_innobase_mutex_exit(os_file_count_mutex); --- > os_mutex_exit(os_file_count_mutex); 1117c1117 < os_innobase_mutex_enter(os_file_seek_mutexes[i]); --- > os_mutex_enter(os_file_seek_mutexes[i]); 1122c1122 < os_innobase_mutex_exit(os_file_seek_mutexes[i]); --- > os_mutex_exit(os_file_seek_mutexes[i]); 1129c1129 < os_innobase_mutex_exit(os_file_seek_mutexes[i]); --- > os_mutex_exit(os_file_seek_mutexes[i]); 1173c1173 < os_innobase_mutex_enter(os_file_count_mutex); --- > os_mutex_enter(os_file_count_mutex); 1175c1175 < os_innobase_mutex_exit(os_file_count_mutex); --- > os_mutex_exit(os_file_count_mutex); 1179c1179 < os_innobase_mutex_enter(os_file_count_mutex); --- > os_mutex_enter(os_file_count_mutex); 1181c1181 < os_innobase_mutex_exit(os_file_count_mutex); --- > os_mutex_exit(os_file_count_mutex); 1202c1202 < os_innobase_mutex_enter(os_file_seek_mutexes[i]); --- > os_mutex_enter(os_file_seek_mutexes[i]); 1207c1207 < os_innobase_mutex_exit(os_file_seek_mutexes[i]); --- > os_mutex_exit(os_file_seek_mutexes[i]); 1225c1225 < os_innobase_mutex_exit(os_file_seek_mutexes[i]); --- > os_mutex_exit(os_file_seek_mutexes[i]); 1274c1274 < os_innobase_mutex_enter(os_file_seek_mutexes[i]); --- > os_mutex_enter(os_file_seek_mutexes[i]); 1280c1280 < os_innobase_mutex_exit(os_file_seek_mutexes[i]); --- > os_mutex_exit(os_file_seek_mutexes[i]); 1287c1287 < os_innobase_mutex_exit(os_file_seek_mutexes[i]); --- > os_mutex_exit(os_file_seek_mutexes[i]); 1372c1372 < os_innobase_mutex_enter(os_file_seek_mutexes[i]); --- > os_mutex_enter(os_file_seek_mutexes[i]); 1378c1378 < os_innobase_mutex_exit(os_file_seek_mutexes[i]); --- > os_mutex_exit(os_file_seek_mutexes[i]); 1402c1402 < os_innobase_mutex_exit(os_file_seek_mutexes[i]); --- > os_mutex_exit(os_file_seek_mutexes[i]); 1525c1525 < array->mutex = os_innobase_mutex_create(NULL); --- > array->mutex = os_mutex_create(NULL); 1873c1873 < os_innobase_mutex_enter(array->mutex); --- > os_mutex_enter(array->mutex); 1876c1876 < os_innobase_mutex_exit(array->mutex); --- > os_mutex_exit(array->mutex); 1949c1949 < os_innobase_mutex_exit(array->mutex); --- > os_mutex_exit(array->mutex); 1966c1966 < os_innobase_mutex_enter(array->mutex); --- > os_mutex_enter(array->mutex); 1985c1985 < os_innobase_mutex_exit(array->mutex); --- > os_mutex_exit(array->mutex); 2011c2011 < os_innobase_mutex_enter(array->mutex); --- > os_mutex_enter(array->mutex); 2023c2023 < os_innobase_mutex_exit(array->mutex); --- > os_mutex_exit(array->mutex); 2338c2338 < os_innobase_mutex_enter(array->mutex); --- > os_mutex_enter(array->mutex); 2365c2365 < os_innobase_mutex_exit(array->mutex); --- > os_mutex_exit(array->mutex); 2430c2430 < os_innobase_mutex_enter(array->mutex); --- > os_mutex_enter(array->mutex); 2444c2444 < os_innobase_mutex_exit(array->mutex); --- > os_mutex_exit(array->mutex); 2513c2513 < os_innobase_mutex_enter(array->mutex); --- > os_mutex_enter(array->mutex); 2653c2653 < os_innobase_mutex_exit(array->mutex); --- > os_mutex_exit(array->mutex); 2731c2731 < os_innobase_mutex_enter(array->mutex); --- > os_mutex_enter(array->mutex); 2752c2752 < os_innobase_mutex_exit(array->mutex); --- > os_mutex_exit(array->mutex); 2764c2764 < os_innobase_mutex_exit(array->mutex); --- > os_mutex_exit(array->mutex); 2796c2796 < os_innobase_mutex_enter(array->mutex); --- > os_mutex_enter(array->mutex); 2812c2812 < os_innobase_mutex_exit(array->mutex); --- > os_mutex_exit(array->mutex); 2868c2868 < os_innobase_mutex_enter(array->mutex); --- > os_mutex_enter(array->mutex); 2891c2891 < os_innobase_mutex_exit(array->mutex); --- > os_mutex_exit(array->mutex); 2994c2994 < os_innobase_mutex_enter(array->mutex); --- > os_mutex_enter(array->mutex); 2998c2998 < os_innobase_mutex_exit(array->mutex); --- > os_mutex_exit(array->mutex); 3002c3002 < os_innobase_mutex_enter(array->mutex); --- > os_mutex_enter(array->mutex); 3006c3006 < os_innobase_mutex_exit(array->mutex); --- > os_mutex_exit(array->mutex); 3010c3010 < os_innobase_mutex_enter(array->mutex); --- > os_mutex_enter(array->mutex); 3014c3014 < os_innobase_mutex_exit(array->mutex); --- > os_mutex_exit(array->mutex); 3018c3018 < os_innobase_mutex_enter(array->mutex); --- > os_mutex_enter(array->mutex); 3022c3022 < os_innobase_mutex_exit(array->mutex); --- > os_mutex_exit(array->mutex); 3026c3026 < os_innobase_mutex_enter(array->mutex); --- > os_mutex_enter(array->mutex); 3030c3030 < os_innobase_mutex_exit(array->mutex); --- > os_mutex_exit(array->mutex); diff -r mysql-4.0.15a/innobase/os/os0sync.c bkp/mysql-4.0.15a/innobase/os/os0sync.c 64c64 < os_sync_mutex = os_innobase_mutex_create(NULL); --- > os_sync_mutex = os_mutex_create(NULL); 150c150 < os_innobase_mutex_enter(os_sync_mutex); --- > os_mutex_enter(os_sync_mutex); 156c156 < os_innobase_mutex_exit(os_sync_mutex); --- > os_mutex_exit(os_sync_mutex); 189c189 < os_innobase_mutex_enter(os_sync_mutex); --- > os_mutex_enter(os_sync_mutex); 195c195 < os_innobase_mutex_exit(os_sync_mutex); --- > os_mutex_exit(os_sync_mutex); 279c279 < os_innobase_mutex_enter(os_sync_mutex); --- > os_mutex_enter(os_sync_mutex); 285c285 < os_innobase_mutex_exit(os_sync_mutex); --- > os_mutex_exit(os_sync_mutex); 431c431 < os_innobase_mutex_create( --- > os_mutex_create( 462c462 < os_innobase_mutex_enter(os_sync_mutex); --- > os_mutex_enter(os_sync_mutex); 470c470 < os_innobase_mutex_exit(os_sync_mutex); --- > os_mutex_exit(os_sync_mutex); 480c480 < os_innobase_mutex_enter( --- > os_mutex_enter( 509c509 < os_innobase_mutex_exit( --- > os_mutex_exit( 536c536 < os_innobase_mutex_enter(os_sync_mutex); --- > os_mutex_enter(os_sync_mutex); 544c544 < os_innobase_mutex_exit(os_sync_mutex); --- > os_mutex_exit(os_sync_mutex); 581c581 < os_innobase_mutex_enter(os_sync_mutex); --- > os_mutex_enter(os_sync_mutex); 587c587 < os_innobase_mutex_exit(os_sync_mutex); --- > os_mutex_exit(os_sync_mutex); 640c640 < os_innobase_mutex_enter(os_sync_mutex); --- > os_mutex_enter(os_sync_mutex); 646c646 < os_innobase_mutex_exit(os_sync_mutex); --- > os_mutex_exit(os_sync_mutex); diff -r mysql-4.0.15a/innobase/os/os0thread.c bkp/mysql-4.0.15a/innobase/os/os0thread.c 105c105 < os_innobase_mutex_enter(os_sync_mutex); --- > os_mutex_enter(os_sync_mutex); 107c107 < os_innobase_mutex_exit(os_sync_mutex); --- > os_mutex_exit(os_sync_mutex); 151c151 < os_innobase_mutex_enter(os_sync_mutex); --- > os_mutex_enter(os_sync_mutex); 153c153 < os_innobase_mutex_exit(os_sync_mutex); --- > os_mutex_exit(os_sync_mutex); 193c193 < os_innobase_mutex_enter(os_sync_mutex); --- > os_mutex_enter(os_sync_mutex); 195c195 < os_innobase_mutex_exit(os_sync_mutex); --- > os_mutex_exit(os_sync_mutex); diff -r mysql-4.0.15a/innobase/que/que0que.c bkp/mysql-4.0.15a/innobase/que/que0que.c 780c780 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 784c784 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 793c793 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 865c865 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 887c887 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 903c903 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 978c978 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 1063c1063 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 1077c1077 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 1092c1092 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 1348c1348 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 1352c1352 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 1472,1473c1472,1473 < innobase_mutex_enter(&kernel_mutex); < innobase_mutex_exit(&kernel_mutex); --- > mutex_enter(&kernel_mutex); > mutex_exit(&kernel_mutex); diff -r mysql-4.0.15a/innobase/read/read0read.c bkp/mysql-4.0.15a/innobase/read/read0read.c 214c214 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 222c222 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); diff -r mysql-4.0.15a/innobase/row/row0ins.c bkp/mysql-4.0.15a/innobase/row/row0ins.c 516c516 < innobase_mutex_enter(&dict_foreign_err_mutex); --- > mutex_enter(&dict_foreign_err_mutex); 543c543 < innobase_mutex_exit(&dict_foreign_err_mutex); --- > mutex_exit(&dict_foreign_err_mutex); 565c565 < innobase_mutex_enter(&dict_foreign_err_mutex); --- > mutex_enter(&dict_foreign_err_mutex); 599c599 < innobase_mutex_exit(&dict_foreign_err_mutex); --- > mutex_exit(&dict_foreign_err_mutex); 1091c1091 < innobase_mutex_enter(&dict_foreign_err_mutex); --- > mutex_enter(&dict_foreign_err_mutex); 1108c1108 < innobase_mutex_exit(&dict_foreign_err_mutex); --- > mutex_exit(&dict_foreign_err_mutex); 1377c1377 < innobase_mutex_enter(&dict_foreign_err_mutex); --- > mutex_enter(&dict_foreign_err_mutex); 1400c1400 < innobase_mutex_exit(&dict_foreign_err_mutex); --- > mutex_exit(&dict_foreign_err_mutex); diff -r mysql-4.0.15a/innobase/row/row0mysql.c bkp/mysql-4.0.15a/innobase/row/row0mysql.c 1228c1228 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 1244c1244 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 1683c1683 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 1695c1695 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 1702c1702 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 1704c1704 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 1724c1724 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 1737c1737 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 1780c1780 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 1792c1792 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); diff -r mysql-4.0.15a/innobase/row/row0purge.c bkp/mysql-4.0.15a/innobase/row/row0purge.c 518c518 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 522c522 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); diff -r mysql-4.0.15a/innobase/row/row0sel.c bkp/mysql-4.0.15a/innobase/row/row0sel.c 3498c3498 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 3525c3525 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); diff -r mysql-4.0.15a/innobase/row/row0upd.c bkp/mysql-4.0.15a/innobase/row/row0upd.c 208c208 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 213c213 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); 225c225 < innobase_mutex_enter(&(dict_sys->mutex)); --- > mutex_enter(&(dict_sys->mutex)); 233c233 < innobase_mutex_exit(&(dict_sys->mutex)); --- > mutex_exit(&(dict_sys->mutex)); diff -r mysql-4.0.15a/innobase/row/row0vers.c bkp/mysql-4.0.15a/innobase/row/row0vers.c 66c66 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 91c91 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 101c101 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 135c135 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 161c161 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); diff -r mysql-4.0.15a/innobase/srv/srv0que.c bkp/mysql-4.0.15a/innobase/srv/srv0que.c 30c30 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 35c35 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 42c42 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 64c64 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 70c70 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 104c104 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 108c108 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); diff -r mysql-4.0.15a/innobase/srv/srv0srv.c bkp/mysql-4.0.15a/innobase/srv/srv0srv.c 543c543 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 550c550 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 702c702 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 713c713 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 727c727 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 738c738 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 750c750 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 762c762 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 812c812 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 823c823 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 837c837 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 840c840 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 857c857 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 872c872 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 875c875 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 892c892 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 908c908 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 921c921 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 925c925 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 943c943 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 945c945 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 1034c1034 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 1036c1036 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 1079c1079 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 1084c1084 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 1187c1187 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 1189c1189 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 1647c1647 < innobase_mutex_create(&kernel_mutex); --- > mutex_create(&kernel_mutex); 1650c1650 < innobase_mutex_create(&srv_innodb_monitor_mutex); --- > mutex_create(&srv_innodb_monitor_mutex); 2135c2135 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 2152c2152 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 2173c2173 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 2212c2212 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 2226c2226 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 2273c2273 < innobase_mutex_enter(&srv_innodb_monitor_mutex); --- > mutex_enter(&srv_innodb_monitor_mutex); 2291c2291 < innobase_mutex_exit(&srv_innodb_monitor_mutex); --- > mutex_exit(&srv_innodb_monitor_mutex); 2308c2308 < innobase_mutex_enter(&srv_innodb_monitor_mutex); --- > mutex_enter(&srv_innodb_monitor_mutex); 2471c2471 < innobase_mutex_exit(&srv_innodb_monitor_mutex); --- > mutex_exit(&srv_innodb_monitor_mutex); 2515c2515 < /* In case innobase_mutex_exit is not a memory barrier, it is --- > /* In case mutex_exit is not a memory barrier, it is 2581c2581 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 2618c2618 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 2739c2739 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 2743c2743 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 2756c2756 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 2760c2760 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 2804c2804 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 2808c2808 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 2820c2820 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 2825c2825 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 3006c3006 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 3012c3012 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 3016c3016 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 3070c3070 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 3072c3072 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 3075c3075 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 3087c3087 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 3089c3089 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 3092c3092 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 3100c3100 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 3102c3102 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 3105c3105 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 3129c3129 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 3131c3131 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 3134c3134 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 3174c3174 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 3177c3177 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 3184c3184 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); diff -r mysql-4.0.15a/innobase/srv/srv0start.c bkp/mysql-4.0.15a/innobase/srv/srv0start.c 424c424 < innobase_mutex_enter(&ios_mutex); --- > mutex_enter(&ios_mutex); 426c426 < innobase_mutex_exit(&ios_mutex); --- > mutex_exit(&ios_mutex); 870c870 < innobase_mutex_create(&ios_mutex); --- > mutex_create(&ios_mutex); 1264c1264 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 1268c1268 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 1362c1362 < innobase_mutex_enter(&(log_sys->mutex)); --- > mutex_enter(&(log_sys->mutex)); 1370c1370 < innobase_mutex_exit(&(log_sys->mutex)); --- > mutex_exit(&(log_sys->mutex)); 1537c1537 < os_innobase_mutex_enter(os_sync_mutex); --- > os_mutex_enter(os_sync_mutex); 1546c1546 < os_innobase_mutex_exit(os_sync_mutex); --- > os_mutex_exit(os_sync_mutex); 1553c1553 < os_innobase_mutex_exit(os_sync_mutex); --- > os_mutex_exit(os_sync_mutex); diff -r mysql-4.0.15a/innobase/sync/sync0arr.c bkp/mysql-4.0.15a/innobase/sync/sync0arr.c 145c145 < os_innobase_mutex_enter(arr->os_mutex); --- > os_mutex_enter(arr->os_mutex); 147c147 < innobase_mutex_enter(&(arr->mutex)); --- > mutex_enter(&(arr->mutex)); 166c166 < os_innobase_mutex_exit(arr->os_mutex); --- > os_mutex_exit(arr->os_mutex); 168c168 < innobase_mutex_exit(&(arr->mutex)); --- > mutex_exit(&(arr->mutex)); 210c210 < arr->os_mutex = os_innobase_mutex_create(NULL); --- > arr->os_mutex = os_mutex_create(NULL); 212c212 < innobase_mutex_create(&(arr->mutex)); --- > mutex_create(&(arr->mutex)); 417c417 < we cannot acquire it at once, innobase_mutex_enter would call --- > we cannot acquire it at once, mutex_enter would call 421c421 < rw_lock_debug_innobase_mutex_enter(); --- > rw_lock_debug_mutex_enter(); 429c429 < rw_lock_debug_innobase_mutex_exit(); --- > rw_lock_debug_mutex_exit(); 861c861 < this function will do the waking (see the comment in innobase_mutex_exit). This --- > this function will do the waking (see the comment in mutex_exit). This diff -r mysql-4.0.15a/innobase/sync/sync0ipm.c bkp/mysql-4.0.15a/innobase/sync/sync0ipm.c 35c35 < ip_innobase_mutex_create( --- > ip_mutex_create( 66c66 < exclude = os_innobase_mutex_create(buf); --- > exclude = os_mutex_create(buf); 76c76 < innobase_mutex_create(mutex); --- > mutex_create(mutex); 92c92 < on ip_innobase_mutex_create. Destroys an ip mutex */ --- > on ip_mutex_create. Destroys an ip mutex */ 139c139 < exclude = os_innobase_mutex_create(buf); --- > exclude = os_mutex_create(buf); diff -r mysql-4.0.15a/innobase/sync/sync0rw.c bkp/mysql-4.0.15a/innobase/sync/sync0rw.c 97c97 < innobase_mutex_create(rw_lock_get_mutex(lock)); --- > mutex_create(rw_lock_get_mutex(lock)); 123c123 < innobase_mutex_enter(&rw_lock_list_mutex); --- > mutex_enter(&rw_lock_list_mutex); 127c127 < innobase_mutex_exit(&rw_lock_list_mutex); --- > mutex_exit(&rw_lock_list_mutex); 149c149 < innobase_mutex_enter(&rw_lock_list_mutex); --- > mutex_enter(&rw_lock_list_mutex); 153c153 < innobase_mutex_exit(&rw_lock_list_mutex); --- > mutex_exit(&rw_lock_list_mutex); 167c167 < innobase_mutex_enter(rw_lock_get_mutex(lock)); --- > mutex_enter(rw_lock_get_mutex(lock)); 179c179 < innobase_mutex_exit(rw_lock_get_mutex(lock)); --- > mutex_exit(rw_lock_get_mutex(lock)); 230c230 < innobase_mutex_enter(rw_lock_get_mutex(lock)); --- > mutex_enter(rw_lock_get_mutex(lock)); 235c235 < innobase_mutex_exit(rw_lock_get_mutex(lock)); --- > mutex_exit(rw_lock_get_mutex(lock)); 251c251 < innobase_mutex_exit(rw_lock_get_mutex(lock)); --- > mutex_exit(rw_lock_get_mutex(lock)); 286c286 < innobase_mutex_enter(&(lock->mutex)); --- > mutex_enter(&(lock->mutex)); 292c292 < innobase_mutex_exit(&(lock->mutex)); --- > mutex_exit(&(lock->mutex)); 422c422 < innobase_mutex_enter_fast(&(lock->mutex)); --- > mutex_enter_fast(&(lock->mutex)); 426c426 < innobase_mutex_exit(&(lock->mutex)); --- > mutex_exit(&(lock->mutex)); 483c483 < innobase_mutex_enter(rw_lock_get_mutex(lock)); --- > mutex_enter(rw_lock_get_mutex(lock)); 488c488 < innobase_mutex_exit(rw_lock_get_mutex(lock)); --- > mutex_exit(rw_lock_get_mutex(lock)); 502c502 < innobase_mutex_exit(rw_lock_get_mutex(lock)); --- > mutex_exit(rw_lock_get_mutex(lock)); 522c522 < mutex protecting the sync array, and the ordinary innobase_mutex_enter might --- > mutex protecting the sync array, and the ordinary mutex_enter might 527c527 < rw_lock_debug_innobase_mutex_enter(void) --- > rw_lock_debug_mutex_enter(void) 531c531 < if (0 == innobase_mutex_enter_nowait(&rw_lock_debug_mutex, --- > if (0 == mutex_enter_nowait(&rw_lock_debug_mutex, 540c540 < if (0 == innobase_mutex_enter_nowait(&rw_lock_debug_mutex, --- > if (0 == mutex_enter_nowait(&rw_lock_debug_mutex, 554c554 < rw_lock_debug_innobase_mutex_exit(void) --- > rw_lock_debug_mutex_exit(void) 557c557 < innobase_mutex_exit(&rw_lock_debug_mutex); --- > mutex_exit(&rw_lock_debug_mutex); 584c584 < rw_lock_debug_innobase_mutex_enter(); --- > rw_lock_debug_mutex_enter(); 594c594 < rw_lock_debug_innobase_mutex_exit(); --- > rw_lock_debug_mutex_exit(); 619c619 < rw_lock_debug_innobase_mutex_enter(); --- > rw_lock_debug_mutex_enter(); 632c632 < rw_lock_debug_innobase_mutex_exit(); --- > rw_lock_debug_mutex_exit(); 677c677 < innobase_mutex_enter(&(lock->mutex)); --- > mutex_enter(&(lock->mutex)); 687c687 < innobase_mutex_exit(&(lock->mutex)); --- > mutex_exit(&(lock->mutex)); 695c695 < innobase_mutex_exit(&(lock->mutex)); --- > mutex_exit(&(lock->mutex)); 716c716 < innobase_mutex_enter(&(lock->mutex)); --- > mutex_enter(&(lock->mutex)); 730c730 < innobase_mutex_exit(&(lock->mutex)); --- > mutex_exit(&(lock->mutex)); 748c748 < innobase_mutex_enter(&rw_lock_list_mutex); --- > mutex_enter(&rw_lock_list_mutex); 760c760 < innobase_mutex_enter(&(lock->mutex)); --- > mutex_enter(&(lock->mutex)); 781c781 < innobase_mutex_exit(&(lock->mutex)); --- > mutex_exit(&(lock->mutex)); 786c786 < innobase_mutex_exit(&rw_lock_list_mutex); --- > mutex_exit(&rw_lock_list_mutex); 874c874 < innobase_mutex_enter(&rw_lock_list_mutex); --- > mutex_enter(&rw_lock_list_mutex); 879c879 < innobase_mutex_enter(rw_lock_get_mutex(lock)); --- > mutex_enter(rw_lock_get_mutex(lock)); 886c886 < innobase_mutex_exit(rw_lock_get_mutex(lock)); --- > mutex_exit(rw_lock_get_mutex(lock)); 890c890 < innobase_mutex_exit(&rw_lock_list_mutex); --- > mutex_exit(&rw_lock_list_mutex); diff -r mysql-4.0.15a/innobase/sync/sync0sync.c bkp/mysql-4.0.15a/innobase/sync/sync0sync.c 107c107 < will set the waiters field to 0 in innobase_mutex_exit, and then call --- > will set the waiters field to 0 in mutex_exit, and then call 123c123 < ulint innobase_mutex_exit_count = 0; --- > ulint mutex_exit_count = 0; 217c217 < innobase_mutex_create_func( --- > mutex_create_func( 247c247 < innobase_mutex_enter(&mutex_list_mutex); --- > mutex_enter(&mutex_list_mutex); 251c251 < innobase_mutex_exit(&mutex_list_mutex); --- > mutex_exit(&mutex_list_mutex); 270c270 < innobase_mutex_enter(&mutex_list_mutex); --- > mutex_enter(&mutex_list_mutex); 274c274 < innobase_mutex_exit(&mutex_list_mutex); --- > mutex_exit(&mutex_list_mutex); 292c292 < innobase_mutex_enter_nowait( --- > mutex_enter_nowait( 439c439 < released in innobase_mutex_exit, the waiters field is first set to zero and --- > released in mutex_exit, the waiters field is first set to zero and 603c603 < innobase_mutex_enter(&mutex_list_mutex); --- > mutex_enter(&mutex_list_mutex); 624c624 < innobase_mutex_exit(&mutex_list_mutex); --- > mutex_exit(&mutex_list_mutex); 644c644 < innobase_mutex_enter(&mutex_list_mutex); --- > mutex_enter(&mutex_list_mutex); 657c657 < innobase_mutex_exit(&mutex_list_mutex); --- > mutex_exit(&mutex_list_mutex); 887c887 < innobase_mutex_enter(&sync_thread_mutex); --- > mutex_enter(&sync_thread_mutex); 893c893 < innobase_mutex_exit(&sync_thread_mutex); --- > mutex_exit(&sync_thread_mutex); 910c910 < innobase_mutex_exit(&sync_thread_mutex); --- > mutex_exit(&sync_thread_mutex); 921c921 < innobase_mutex_exit(&sync_thread_mutex); --- > mutex_exit(&sync_thread_mutex); 972c972 < innobase_mutex_enter(&sync_thread_mutex); --- > mutex_enter(&sync_thread_mutex); 1116c1116 < innobase_mutex_exit(&sync_thread_mutex); --- > mutex_exit(&sync_thread_mutex); 1147c1147 < innobase_mutex_enter(&sync_thread_mutex); --- > mutex_enter(&sync_thread_mutex); 1155c1155 < innobase_mutex_exit(&sync_thread_mutex); --- > mutex_exit(&sync_thread_mutex); 1168c1168 < innobase_mutex_exit(&sync_thread_mutex); --- > mutex_exit(&sync_thread_mutex); 1176c1176 < innobase_mutex_exit(&sync_thread_mutex); --- > mutex_exit(&sync_thread_mutex); 1215c1215 < innobase_mutex_create(&mutex_list_mutex); --- > mutex_create(&mutex_list_mutex); 1218c1218 < innobase_mutex_create(&sync_thread_mutex); --- > mutex_create(&sync_thread_mutex); 1224c1224 < innobase_mutex_create(&rw_lock_list_mutex); --- > mutex_create(&rw_lock_list_mutex); 1227c1227 < innobase_mutex_create(&rw_lock_debug_mutex); --- > mutex_create(&rw_lock_debug_mutex); 1268c1268 < innobase_mutex_exit_count, rw_s_exit_count, rw_x_exit_count); --- > mutex_exit_count, rw_s_exit_count, rw_x_exit_count); diff -r mysql-4.0.15a/innobase/thr/thr0loc.c bkp/mysql-4.0.15a/innobase/thr/thr0loc.c 75c75 < innobase_mutex_exit(&thr_local_mutex); --- > mutex_exit(&thr_local_mutex); 79c79 < innobase_mutex_enter(&thr_local_mutex); --- > mutex_enter(&thr_local_mutex); 101c101 < innobase_mutex_enter(&thr_local_mutex); --- > mutex_enter(&thr_local_mutex); 107c107 < innobase_mutex_exit(&thr_local_mutex); --- > mutex_exit(&thr_local_mutex); 123c123 < innobase_mutex_enter(&thr_local_mutex); --- > mutex_enter(&thr_local_mutex); 129c129 < innobase_mutex_exit(&thr_local_mutex); --- > mutex_exit(&thr_local_mutex); 143c143 < innobase_mutex_enter(&thr_local_mutex); --- > mutex_enter(&thr_local_mutex); 147c147 < innobase_mutex_exit(&thr_local_mutex); --- > mutex_exit(&thr_local_mutex); 173c173 < innobase_mutex_enter(&thr_local_mutex); --- > mutex_enter(&thr_local_mutex); 179c179 < innobase_mutex_exit(&thr_local_mutex); --- > mutex_exit(&thr_local_mutex); 192c192 < innobase_mutex_enter(&thr_local_mutex); --- > mutex_enter(&thr_local_mutex); 199c199 < innobase_mutex_exit(&thr_local_mutex); --- > mutex_exit(&thr_local_mutex); 207c207 < innobase_mutex_exit(&thr_local_mutex); --- > mutex_exit(&thr_local_mutex); 226c226 < innobase_mutex_create(&thr_local_mutex); --- > mutex_create(&thr_local_mutex); diff -r mysql-4.0.15a/innobase/trx/trx0purge.c bkp/mysql-4.0.15a/innobase/trx/trx0purge.c 215c215 < innobase_mutex_create(&(purge_sys->mutex)); --- > mutex_create(&(purge_sys->mutex)); 344c344 < innobase_mutex_enter(&(rseg->mutex)); --- > mutex_enter(&(rseg->mutex)); 367c367 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 409c409 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 440c440 < innobase_mutex_enter(&(rseg->mutex)); --- > mutex_enter(&(rseg->mutex)); 449c449 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 472c472 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 490c490 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 497c497 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 502c502 < innobase_mutex_enter(&(rseg->mutex)); --- > mutex_enter(&(rseg->mutex)); 594c594 < innobase_mutex_enter(&(rseg->mutex)); --- > mutex_enter(&(rseg->mutex)); 621c621 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 627c627 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 643c643 < innobase_mutex_enter(&(rseg->mutex)); --- > mutex_enter(&(rseg->mutex)); 650c650 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 682c682 < innobase_mutex_enter(&(rseg->mutex)); --- > mutex_enter(&(rseg->mutex)); 701c701 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 887c887 < innobase_mutex_enter(&(purge_sys->mutex)); --- > mutex_enter(&(purge_sys->mutex)); 892c892 < innobase_mutex_exit(&(purge_sys->mutex)); --- > mutex_exit(&(purge_sys->mutex)); 911c911 < innobase_mutex_exit(&(purge_sys->mutex)); --- > mutex_exit(&(purge_sys->mutex)); 923c923 < innobase_mutex_exit(&(purge_sys->mutex)); --- > mutex_exit(&(purge_sys->mutex)); 934c934 < innobase_mutex_exit(&(purge_sys->mutex)); --- > mutex_exit(&(purge_sys->mutex)); 959c959 < innobase_mutex_exit(&(purge_sys->mutex)); --- > mutex_exit(&(purge_sys->mutex)); 974c974 < innobase_mutex_enter(&(purge_sys->mutex)); --- > mutex_enter(&(purge_sys->mutex)); 980c980 < innobase_mutex_exit(&(purge_sys->mutex)); --- > mutex_exit(&(purge_sys->mutex)); 996c996 < innobase_mutex_enter(&(purge_sys->mutex)); --- > mutex_enter(&(purge_sys->mutex)); 1000c1000 < innobase_mutex_exit(&(purge_sys->mutex)); --- > mutex_exit(&(purge_sys->mutex)); 1011c1011 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 1021c1021 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 1033c1033 < innobase_mutex_exit(&(purge_sys->mutex)); --- > mutex_exit(&(purge_sys->mutex)); 1035c1035 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 1046c1046 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); diff -r mysql-4.0.15a/innobase/trx/trx0rec.c bkp/mysql-4.0.15a/innobase/trx/trx0rec.c 1069c1069 < innobase_mutex_enter(&(trx->undo_mutex)); --- > mutex_enter(&(trx->undo_mutex)); 1097c1097 < innobase_mutex_exit(&(trx->undo_mutex)); --- > mutex_exit(&(trx->undo_mutex)); 1153c1153 < innobase_mutex_enter(&(rseg->mutex)); --- > mutex_enter(&(rseg->mutex)); 1157c1157 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 1162c1162 < innobase_mutex_exit(&(trx->undo_mutex)); --- > mutex_exit(&(trx->undo_mutex)); 1177c1177 < innobase_mutex_exit(&(trx->undo_mutex)); --- > mutex_exit(&(trx->undo_mutex)); diff -r mysql-4.0.15a/innobase/trx/trx0roll.c bkp/mysql-4.0.15a/innobase/trx/trx0roll.c 80c80 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 84c84 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 88c88 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 91c91 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 352c352 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 361c361 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 373c373 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 382c382 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 417c417 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 436c436 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 444c444 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 448c448 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 455c455 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 458c458 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 788c788 < innobase_mutex_enter(&(trx->undo_mutex)); --- > mutex_enter(&(trx->undo_mutex)); 791c791 < innobase_mutex_enter(&(rseg->mutex)); --- > mutex_enter(&(rseg->mutex)); 795c795 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 818c818 < innobase_mutex_enter(&(rseg->mutex)); --- > mutex_enter(&(rseg->mutex)); 822c822 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 825c825 < innobase_mutex_exit(&(trx->undo_mutex)); --- > mutex_exit(&(trx->undo_mutex)); 871c871 < innobase_mutex_exit(&(trx->undo_mutex)); --- > mutex_exit(&(trx->undo_mutex)); 880c880 < innobase_mutex_exit(&(trx->undo_mutex)); --- > mutex_exit(&(trx->undo_mutex)); 901c901 < innobase_mutex_enter(&(trx->undo_mutex)); --- > mutex_enter(&(trx->undo_mutex)); 905c905 < innobase_mutex_exit(&(trx->undo_mutex)); --- > mutex_exit(&(trx->undo_mutex)); 921c921 < innobase_mutex_enter(&(trx->undo_mutex)); --- > mutex_enter(&(trx->undo_mutex)); 927c927 < innobase_mutex_exit(&(trx->undo_mutex)); --- > mutex_exit(&(trx->undo_mutex)); 1200c1200 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 1220c1220 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); diff -r mysql-4.0.15a/innobase/trx/trx0rseg.c bkp/mysql-4.0.15a/innobase/trx/trx0rseg.c 143c143 < innobase_mutex_create(&(rseg->mutex)); --- > mutex_create(&(rseg->mutex)); 236c236 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 242c242 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 248c248 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); diff -r mysql-4.0.15a/innobase/trx/trx0sys.c bkp/mysql-4.0.15a/innobase/trx/trx0sys.c 83c83 < innobase_mutex_create(&(trx_doublewrite->mutex)); --- > mutex_create(&(trx_doublewrite->mutex)); 672c672 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 699c699 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 720c720 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 781c781 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); diff -r mysql-4.0.15a/innobase/trx/trx0trx.c bkp/mysql-4.0.15a/innobase/trx/trx0trx.c 111c111 < innobase_mutex_create(&(trx->undo_mutex)); --- > mutex_create(&(trx->undo_mutex)); 169c169 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 184c184 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 203c203 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 214c214 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 309c309 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 319c319 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 330c330 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 334c334 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 600c600 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 604c604 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 630c630 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 642c642 < innobase_mutex_enter(&(rseg->mutex)); --- > mutex_enter(&(rseg->mutex)); 652c652 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 671c671 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 678c678 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 695c695 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 737c737 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 774c774 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 837c837 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 894c894 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 900c900 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 1455c1455 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 1469c1469 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 1507c1507 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 1511c1511 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); diff -r mysql-4.0.15a/innobase/trx/trx0undo.c bkp/mysql-4.0.15a/innobase/trx/trx0undo.c 1063c1063 < innobase_mutex_enter(&(rseg->mutex)); --- > mutex_enter(&(rseg->mutex)); 1081c1081 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 1137c1137 < innobase_mutex_enter(&(rseg->mutex)); --- > mutex_enter(&(rseg->mutex)); 1141c1141 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 1526c1526 < innobase_mutex_enter(&(rseg->mutex)); --- > mutex_enter(&(rseg->mutex)); 1536c1536 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 1557c1557 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 1714c1714 < innobase_mutex_enter(&(rseg->mutex)); --- > mutex_enter(&(rseg->mutex)); 1727c1727 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); 1731c1731 < innobase_mutex_enter(&(rseg->mutex)); --- > mutex_enter(&(rseg->mutex)); 1740c1740 < innobase_mutex_exit(&(rseg->mutex)); --- > mutex_exit(&(rseg->mutex)); diff -r mysql-4.0.15a/innobase/usr/usr0sess.c bkp/mysql-4.0.15a/innobase/usr/usr0sess.c 426c426 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 433c433 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 749c749 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 755c755 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 799c799 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 803c803 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 871c871 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 883c883 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 889c889 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 899c899 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 913c913 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 919c919 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 933c933 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 937c937 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 1125c1125 < innobase_mutex_enter(&kernel_mutex); --- > mutex_enter(&kernel_mutex); 1142c1142 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 1155c1155 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 1166c1166 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); 1173c1173 < innobase_mutex_exit(&kernel_mutex); --- > mutex_exit(&kernel_mutex); diff -r mysql-4.0.15a/libmysqld/field.cc bkp/mysql-4.0.15a/libmysqld/field.cc 40,42c40 < //Sp.Raja In LynxOS, we have fconvert but no floatingpoint.h < //#ifdef HAVE_FCONVERT < #ifdef HAVE_FLOATINGPOINT_H --- > #ifdef HAVE_FCONVERT 2072d2069 < #if 0 //Sp.Raja LynxOS 2074,2076d2070 < #else < VOID(fconvert(&nr,tmp_dec,&decpt,&sign,buff)); < #endif diff -r mysql-4.0.15a/libmysqld/sql_string.cc bkp/mysql-4.0.15a/libmysqld/sql_string.cc 27,29c27 < //Sp.Raja In LynxOS, we have fconvert but no floatingpoint.h < //#ifdef HAVE_FCONVERT < #ifdef HAVE_FLOATINGPOINT_H --- > #ifdef HAVE_FCONVERT diff -r mysql-4.0.15a/mysys/my_pthread.c bkp/mysql-4.0.15a/mysys/my_pthread.c 41,42d40 < //Sp.Raja LynxOS < #if 0 45d42 < #endif 176c173 < /* #if !defined(HAVE_SIGWAIT) && !defined(HAVE_mit_thread) && !defined(sigwait) && !defined(__WIN__) && !defined(HAVE_rts_threads) && !defined(HAVE_NONPOSIX_SIGWAIT) && !defined(HAVE_DEC_3_2_THREADS) && !defined(OS2) --- > #if !defined(HAVE_SIGWAIT) && !defined(HAVE_mit_thread) && !defined(sigwait) && !defined(__WIN__) && !defined(HAVE_rts_threads) && !defined(HAVE_NONPOSIX_SIGWAIT) && !defined(HAVE_DEC_3_2_THREADS) && !defined(OS2) 178,181c175 < #if !defined(DONT_USE_SIGSUSPEND) */ < //Sp.Raja LynxOS < #if 1 < #if 1 --- > #if !defined(DONT_USE_SIGSUSPEND) 230c224 < #if 0 //Sp.Raja LynxOS --- > 232,234d225 < #else < int mysql_sigwait(sigset_t *setp, int *sigp) < #endif diff -r mysql-4.0.15a/mysys/my_symlink.c bkp/mysql-4.0.15a/mysys/my_symlink.c 47,49c47 < if (((my_errno=errno) == EINVAL) < //Sp.Raja LynxOS < || ((my_errno=errno) == ENXIO)) --- > if ((my_errno=errno) == EINVAL) diff -r mysql-4.0.15a/mysys/my_thr_init.c bkp/mysql-4.0.15a/mysys/my_thr_init.c 193d192 < #if 0 //Sp.Raja LynxOS 195d193 < #endif diff -r mysql-4.0.15a/readline/vi_mode.c bkp/mysql-4.0.15a/readline/vi_mode.c 38,40d37 < //Sp.Raja LynxOS < # include < diff -r mysql-4.0.15a/sql/field.cc bkp/mysql-4.0.15a/sql/field.cc 40,42c40 < //Sp.Raja In LynxOS, we have fconvert but no floatingpoint.h < //#ifdef HAVE_FCONVERT < #ifdef HAVE_FLOATINGPOINT_H --- > #ifdef HAVE_FCONVERT 2072d2069 < #if 0 //Sp.Raja LynxOS 2074,2076d2070 < #else < VOID(fconvert(&nr,tmp_dec,&decpt,&sign,buff)); < #endif diff -r mysql-4.0.15a/sql/mysqld.cc bkp/mysql-4.0.15a/sql/mysqld.cc 2987d2986 < #if 0 //Sp.Raja LynxOS, getsockname returns error for some reason 2991d2989 < #endif diff -r mysql-4.0.15a/sql/sql_string.cc bkp/mysql-4.0.15a/sql/sql_string.cc 27,29c27 < //Sp.Raja In LynxOS, we have fconvert but no floatingpoint.h < //#ifdef HAVE_FCONVERT < #ifdef HAVE_FLOATINGPOINT_H --- > #ifdef HAVE_FCONVERT