aboutsummaryrefslogtreecommitdiff
path: root/databases/mysql54-server/files
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mysql54-server/files')
-rw-r--r--databases/mysql54-server/files/patch-Makefile.in16
-rw-r--r--databases/mysql54-server/files/patch-ab35
-rw-r--r--databases/mysql54-server/files/patch-af73
-rw-r--r--databases/mysql54-server/files/patch-ap11
-rw-r--r--databases/mysql54-server/files/patch-configure110
5 files changed, 0 insertions, 245 deletions
diff --git a/databases/mysql54-server/files/patch-Makefile.in b/databases/mysql54-server/files/patch-Makefile.in
deleted file mode 100644
index ca3680549992..000000000000
--- a/databases/mysql54-server/files/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.in.orig Sun Jun 6 04:51:50 1999
-+++ Makefile.in Sat Jun 26 08:53:51 1999
-@@ -141,8 +141,11 @@
- # These are built from source in the Docs directory
- EXTRA_DIST = INSTALL-SOURCE-GENERIC README PUBLIC INSTALL-SOURCE MIRRORS
-
--SUBDIRS = @docs_dirs@ @readline_dir@ client @sql_server_dirs@ scripts include tests man @bench_dirs@ support-files
--
-+.if defined(CLIENT_ONLY)
-+SUBDIRS = @readline_dir@ client include tests man
-+.else
-+SUBDIRS = @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files
-+.endif
-
- # Relink after clean
- CLEANFILES = linked_client_sources
diff --git a/databases/mysql54-server/files/patch-ab b/databases/mysql54-server/files/patch-ab
deleted file mode 100644
index 04825c3dc4b1..000000000000
--- a/databases/mysql54-server/files/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
---- scripts/mysql_install_db.sh.orig Sat Aug 28 13:10:54 1999
-+++ scripts/mysql_install_db.sh Mon Sep 13 00:13:04 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
-@@ -255,12 +249,6 @@
- END_OF_DATA
- then
- echo ""
-- if test "$IN_RPM" -eq 0
-- then
-- echo "To start mysqld at boot time you have to copy support-files/mysql.server"
-- echo "to the right place for your system"
-- echo
-- fi
- echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
- echo "This is done with:"
- echo "$bindir/mysqladmin -u root password 'new-password'"
diff --git a/databases/mysql54-server/files/patch-af b/databases/mysql54-server/files/patch-af
deleted file mode 100644
index 2593da4d1c64..000000000000
--- a/databases/mysql54-server/files/patch-af
+++ /dev/null
@@ -1,73 +0,0 @@
---- scripts/safe_mysqld.sh.orig Fri May 14 11:11:46 1999
-+++ scripts/safe_mysqld.sh Tue Jun 8 11:14:02 1999
-@@ -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 are
-- DATADIR=$MY_BASEDIR_VERSION/data # Where the databases are
-- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is
--# 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 are
-- DATADIR=$MY_BASEDIR_VERSION/var # Where the databases are
-- ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld is
--else
-- MY_BASEDIR_VERSION=@prefix@
-- DATADIR=@localstatedir@
-- ledir=@libexecdir@
-- if test ! -x $ledir/mysqld
-- then
-- echo "The file $ledir/mysqld doesn't exist or is not executable"
-- echo "Please do a cd to the mysql installation directory and restart"
-- echo "this script 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 process 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 process 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 process 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/mysql54-server/files/patch-ap b/databases/mysql54-server/files/patch-ap
deleted file mode 100644
index f42968f78ee6..000000000000
--- a/databases/mysql54-server/files/patch-ap
+++ /dev/null
@@ -1,11 +0,0 @@
---- strings/Makefile.in.orig Thu Sep 9 10:52:02 1999
-+++ strings/Makefile.in Sun Sep 12 23:56:25 1999
-@@ -143,7 +143,7 @@
- pkglib_LIBRARIES = libmystrings.a
- # These file MUST all be on the same line!! Otherwise automake
- # generats a very broken makefile
--@ASSEMBLER_TRUE@ESRCS = strings.s longlong2str-x86.s
-+@ASSEMBLER_TRUE@ESRCS = strings.S longlong2str-x86.S
- @ASSEMBLER_FALSE@ESRCS = strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c
-
- libmystrings_a_SOURCES = bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c ct_init.c atof.c ptr_cmp.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c @CHARSET_SRCS@ $(ESRCS)
diff --git a/databases/mysql54-server/files/patch-configure b/databases/mysql54-server/files/patch-configure
deleted file mode 100644
index 35b814b673b8..000000000000
--- a/databases/mysql54-server/files/patch-configure
+++ /dev/null
@@ -1,110 +0,0 @@
---- configure.orig Wed Oct 6 00:10:05 1999
-+++ configure Thu Nov 25 21:00:43 1999
-@@ -2070,8 +2070,8 @@
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
- LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
- DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-
- # Reload cache, that may have been modified by ltconfig
-@@ -2085,7 +2085,7 @@
-
-
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -2737,7 +2737,7 @@
- ;;
- esac
- fi
--HOSTNAME="$ac_cv_path_HOSTNAME"
-+HOSTNAME="$ac_cv_path_HOSTNAME -s"
- if test -n "$HOSTNAME"; then
- echo "$ac_t""$HOSTNAME" 1>&6
- else
-@@ -2865,30 +2865,7 @@
- echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
- echo "configure:2867: 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
-@@ -4569,8 +4546,6 @@
- #define $ac_tr_lib 1
- EOF
-
-- LIBS="-lc_r $LIBS"
--
- else
- echo "$ac_t""no" 1>&6
- fi
-@@ -4804,28 +4779,6 @@
- fi
-
-
--# Build optimized or debug version ?
--# First check for gcc and g++
--if test "$ac_cv_prog_gcc" = "yes"
--then
-- DEBUG_CFLAGS="-g"
-- DEBUG_OPTIMIZE_CC="-O"
-- OPTIMIZE_CFLAGS="-O6"
--else
-- DEBUG_CFLAGS="-g"
-- DEBUG_OPTIMIZE_CC=""
-- OPTIMIZE_CFLAGS="-O"
--fi
--if test "$ac_cv_prog_cxx_g" = "yes"
--then
-- DEBUG_CXXFLAGS="-g"
-- DEBUG_OPTIMIZE_CXX="-O"
-- OPTIMIZE_CXXFLAGS="-O3"
--else
-- DEBUG_CXXFLAGS="-g"
-- DEBUG_OPTIMIZE_CXX=""
-- OPTIMIZE_CXXFLAGS="-O"
--fi
- # Check whether --with-debug or --without-debug was given.
- if test "${with_debug+set}" = set; then
- withval="$with_debug"
-@@ -8064,7 +8017,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