diff options
Diffstat (limited to 'databases/mysql60-server/files')
-rw-r--r-- | databases/mysql60-server/files/patch-ab | 22 | ||||
-rw-r--r-- | databases/mysql60-server/files/patch-af | 73 | ||||
-rw-r--r-- | databases/mysql60-server/files/patch-configure | 67 |
3 files changed, 0 insertions, 162 deletions
diff --git a/databases/mysql60-server/files/patch-ab b/databases/mysql60-server/files/patch-ab deleted file mode 100644 index 52b6b394986d..000000000000 --- a/databases/mysql60-server/files/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ ---- scripts/mysql_install_db.sh.orig Mon Mar 1 20:08:17 1999 -+++ scripts/mysql_install_db.sh Thu Mar 4 22:05:57 1999 -@@ -15,10 +15,6 @@ - force=0 - IN_RPM=0 - --# Are we doing an rpm install? --if test "$1" = "-IN-RPM"; then IN_RPM=1; shift; fi --if test "$1" = "--force"; then force=1; shift; fi -- - # Get mysqld/safe_mysqld options from /etc/my.cnf or ~/.my.cnf - if test -w / - then -@@ -60,8 +56,6 @@ - fi - fi - --# On IRIX hostname is in /usr/bsd so add this to the path --PATH=$PATH:/usr/bsd - hostname=`hostname` # Install this too in the user table - - # Check if hostname is valid diff --git a/databases/mysql60-server/files/patch-af b/databases/mysql60-server/files/patch-af deleted file mode 100644 index c9dfae350bef..000000000000 --- a/databases/mysql60-server/files/patch-af +++ /dev/null @@ -1,73 +0,0 @@ ---- scripts/safe_mysqld.sh.orig Fri Nov 27 00:37:54 1998 -+++ scripts/safe_mysqld.sh Wed Dec 23 23:45:24 1998 -@@ -12,33 +12,9 @@ - - trap '' 1 2 3 15 # we shouldn't let anyone kill us - --# Check if we are starting this relative (for the binary release) --if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ -- -x ./bin/mysqld --then -- MY_BASEDIR_VERSION=`pwd` # Where bin, share and data is -- DATADIR=$MY_BASEDIR_VERSION/data # Where the databases are -- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld are --# Check if this is a 'moved install directory' --elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ -- -x ./libexec/mysqld --then -- MY_BASEDIR_VERSION=`pwd` # Where libexec, share and var is -- DATADIR=$MY_BASEDIR_VERSION/var # Where the databases are -- ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld are --else -- MY_BASEDIR_VERSION=@prefix@ -- DATADIR=@localstatedir@ -- ledir=@libexecdir@ -- if test ! -x $ledir/mysqld -- then -- echo "The file $ledir/mysqld doesn't exists or is not executable" -- echo "Please do a cd to the mysql installation directory and restart" -- echo "this scrift from there as follows:" -- echo "./bin/safe_mysqld". -- exit 1; -- fi --fi -+MY_BASEDIR_VERSION=@prefix@ -+DATADIR=@localstatedir@ -+ledir=@libexecdir@ - - pid_file=$DATADIR/`@HOSTNAME@`.pid - log=$DATADIR/`@HOSTNAME@`.log -@@ -114,33 +90,6 @@ - if test ! -f $pid_file # This is removed if normal shutdown - then - break; -- fi -- if @IS_LINUX@ -- then -- # Test if one proces was hanging. -- # This is only a fix for Linux (running as base 3 mysqld processes) -- # but should work for the rest of the servers. -- # The only thing is ps x => redhat 5 gives warnings when using ps -x. -- # kill -9 is used or the proces won't react on the kill. -- numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld` -- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log -- I=1 -- while test "$I" -le "$numofproces" -- do -- PROC=`ps x | grep $ledir/mysqld | grep -v "grep" | tail -1` -- for T in $PROC -- do -- break -- done -- # echo "TEST $I - $T **" -- if kill -9 $T -- then -- echo "mysqld proces hanging, pid $T - killed" | tee -a $err_log -- else -- break -- fi -- I=`expr $I + 1` -- done - fi - echo "mysqld restarted on " `date` | tee -a $err_log - done diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure deleted file mode 100644 index 0f4d1b00d253..000000000000 --- a/databases/mysql60-server/files/patch-configure +++ /dev/null @@ -1,67 +0,0 @@ ---- configure.orig Mon Apr 5 01:46:35 1999 -+++ configure Tue Apr 6 23:08:43 1999 -@@ -2199,30 +2199,7 @@ - echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:2201: checking "how to check if pid exists"" >&5 - PS=$ac_cv_path_PS --# Linux style --if $PS p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" --# Solaris --elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" --# BSD style --elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" --# SysV style --elif $PS -ef 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null" --# Do anybody use this? --elif $PS $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null" --else -- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; } --fi -- -+FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" - echo "$ac_t"""$FIND_PROC"" 1>&6 - - # Check if a pid is valid -@@ -3684,8 +3661,6 @@ - #define $ac_tr_lib 1 - EOF - -- LIBS="-lc_r $LIBS" -- - else - echo "$ac_t""no" 1>&6 - fi -@@ -3935,14 +3910,6 @@ - else - CFLAGS="$CFLAGS -DDBUG_OFF" - CXXFLAGS="$CXXFLAGS -DDBUG_OFF" -- if test "$ac_cv_prog_gcc" = "yes" -- then -- CFLAGS="-O6 $CFLAGS" -- CXXFLAGS="-O $CXXFLAGS" # Should be -O3 with gcc or g++ -- else -- CFLAGS="-O $CFLAGS" -- CXXFLAGS="-O $CXXFLAGS" -- fi - fi - - # Force static compilation to avoid linking probles/get more speed -@@ -7004,7 +6971,7 @@ - echo "" - echo "Configuring MIT Pthreads" - # We will never install so installation paths are not needed. -- (cd mit-pthreads; sh ./configure) -+ (cd mit-pthreads; sh ./configure ${CONFIGURE_ARGS}) - echo "End of MIT Pthreads configuration" - echo "" - fi |