Commit df8b307a authored by monty@bitch.mysql.fi's avatar monty@bitch.mysql.fi
Browse files

Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0

parents 4aa69fd5 1904d7a8

include/my_pthread.h

+2 −0
Original line number Diff line number Diff line
@@ -448,6 +448,8 @@ struct hostent *my_gethostbyname_r(const char *name, 


#if defined(HPUX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)

#define pthread_cond_timedwait(a,b,c) my_pthread_cond_timedwait((a),(b),(c))

int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,

			      struct timespec *abstime);

#endif



	/* safe_mutex adds checking to mutex for easier debugging */

mysql-test/mysql-test-run.sh

+6 −7
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ which () 
  do

    for dir in $PATH

    do

      if test -f $dir/$file

      if test -e $dir/$file

      then

        echo "$dir/$file"

        continue 2
@@ -49,8 +49,7 @@ sleep_until_file_deleted () 
  loop=$SLEEP_TIME_FOR_DELETE

  while (test $loop -gt 0)

  do

    sleep 1

    if [ ! -f $file ]

    if [ ! -e $file ]

    then

      return

    fi
@@ -65,11 +64,11 @@ sleep_until_file_exists () 
  org_time=$2

  while (test $loop -gt 0)

  do

    sleep 1

    if [ -f $file ]

    if [ -e $file ]

    then

      return

    fi

    sleep 1

    loop=`expr $loop - 1`

  done

  echo "ERROR: $file was not created in $org_time seconds;  Aborting"
@@ -772,7 +771,7 @@ EOF 
  else

    manager_launch master $MYSQLD $master_args

  fi

  sleep_until_file_exists $MASTER_MYPID $wait_for_master

  sleep_until_file_exists $MASTER_MYSOCK $wait_for_master

  wait_for_master=$SLEEP_TIME_FOR_SECOND_MASTER

  MASTER_RUNNING=1

}
@@ -872,7 +871,7 @@ start_slave() 
    manager_launch $slave_ident $SLAVE_MYSQLD $slave_args

  fi

  eval "SLAVE$1_RUNNING=1"

  sleep_until_file_exists $slave_pid $wait_for_slave

  sleep_until_file_exists $slave_sock $wait_for_slave

  wait_for_slave=$SLEEP_TIME_FOR_SECOND_SLAVE

}

mysys/my_static.c

+7 −0
Original line number Diff line number Diff line
@@ -82,6 +82,13 @@ struct remember *pRememberRoot = NULL; 
int volatile my_have_got_alarm=0;	/* declare variable to reset */

ulong my_time_to_wait_for_lock=2;	/* In seconds */



	/*

	  We need to have this define here as otherwise linking will fail

	  on OSF1 when compiling --without-raid --with-debug

	*/



const char *raid_type_string[]={"none","striped"};



	/* from errors.c */

#ifdef SHARED_LIBRARY

char * NEAR globerrs[GLOBERRS];		/* my_error_messages is here */

mysys/raid.cc

+0 −2
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ 
#include <m_string.h>

#include <assert.h>



const char *raid_type_string[]={"none","striped"};



#if defined(USE_RAID) && !defined(MYSQL_CLIENT)



#define RAID_SEEK_DONE ~(off_t) 0

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ inline void reset_floating_point_exceptions() 
#if defined(__i386__)

  fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ |

	      FP_X_IMP));

else

#else

 fpsetmask(~(FP_X_INV |             FP_X_OFL | FP_X_UFL | FP_X_DZ |

	     FP_X_IMP));

#endif