summaryrefslogtreecommitdiff
path: root/databases/mysql50-server/files
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mysql50-server/files')
-rw-r--r--databases/mysql50-server/files/mysql-client.sh15
-rw-r--r--databases/mysql50-server/files/mysql-server.sh18
-rw-r--r--databases/mysql50-server/files/patch-Makefile.in16
-rw-r--r--databases/mysql50-server/files/patch-ab24
-rw-r--r--databases/mysql50-server/files/patch-af66
-rw-r--r--databases/mysql50-server/files/patch-ap11
-rw-r--r--databases/mysql50-server/files/patch-aq13
-rw-r--r--databases/mysql50-server/files/patch-as16
-rw-r--r--databases/mysql50-server/files/patch-configure157
-rw-r--r--databases/mysql50-server/files/patch-include::Makefile.in23
10 files changed, 0 insertions, 359 deletions
diff --git a/databases/mysql50-server/files/mysql-client.sh b/databases/mysql50-server/files/mysql-client.sh
deleted file mode 100644
index bef414c12ed2..000000000000
--- a/databases/mysql50-server/files/mysql-client.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case "$1" in
- start)
- /sbin/ldconfig -m %%PREFIX%%/lib/mysql
- ;;
- stop)
- ;;
- *)
- echo ""
- echo "Usage: `basename $0` { start | stop }"
- echo ""
- exit 64
- ;;
-esac
diff --git a/databases/mysql50-server/files/mysql-server.sh b/databases/mysql50-server/files/mysql-server.sh
deleted file mode 100644
index 0ff5374c48f7..000000000000
--- a/databases/mysql50-server/files/mysql-server.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-case "$1" in
- start)
- if [ -x %%PREFIX%%/bin/safe_mysqld ]; then
- %%PREFIX%%/bin/safe_mysqld --user=mysql > /dev/null & && echo -n ' mysqld'
- fi
- ;;
- stop)
- /usr/bin/killall mysqld > /dev/null 2>&1 && echo -n ' mysqld'
- ;;
- *)
- echo ""
- echo "Usage: `basename $0` { start | stop }"
- echo ""
- exit 64
- ;;
-esac
diff --git a/databases/mysql50-server/files/patch-Makefile.in b/databases/mysql50-server/files/patch-Makefile.in
deleted file mode 100644
index 7a7ba5097039..000000000000
--- a/databases/mysql50-server/files/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.in.orig Fri Sep 8 10:00:29 2000
-+++ Makefile.in Sat Sep 23 21:26:18 2000
-@@ -172,8 +172,12 @@
- # These are built from source in the Docs directory
- EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS
-
--SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files
-
-+.if defined(CLIENT_ONLY)
-+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man
-+.else
-+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files
-+.endif
-
- # Relink after clean
- CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources
diff --git a/databases/mysql50-server/files/patch-ab b/databases/mysql50-server/files/patch-ab
deleted file mode 100644
index dfeb77aaa3f9..000000000000
--- a/databases/mysql50-server/files/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
---- scripts/mysql_install_db.sh.orig Fri Sep 8 09:50:24 2000
-+++ scripts/mysql_install_db.sh Sat Sep 23 21:13:37 2000
-@@ -21,8 +21,6 @@
- case "$1" in
- -*) eqvalue="`echo $1 |sed 's/[-_a-zA-Z0-9]*=//'`"
- case "$1" in
-- -IN-RPM) IN_RPM=1
-- ;;
- --force) force=1
- ;;
- --no-defaults) defaults="$1"; CONFIG_FILES=/nonexistent
-@@ -304,12 +302,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 -p password 'new-password'"
diff --git a/databases/mysql50-server/files/patch-af b/databases/mysql50-server/files/patch-af
deleted file mode 100644
index 05b70349d841..000000000000
--- a/databases/mysql50-server/files/patch-af
+++ /dev/null
@@ -1,66 +0,0 @@
---- scripts/safe_mysqld.sh.orig Fri Sep 8 09:50:24 2000
-+++ scripts/safe_mysqld.sh Sat Sep 23 21:16:08 2000
-@@ -36,26 +36,9 @@
- done
- }
-
--MY_PWD=`pwd`
--# Check if we are starting this relative (for the binary release)
--if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
-- -x ./bin/mysqld
--then
-- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are
-- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is
-- DATADIR=$MY_BASEDIR_VERSION/data
--# 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=$MY_PWD # Where libexec, share and var are
-- ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld is
-- DATADIR=$MY_BASEDIR_VERSION/var
--else
-- MY_BASEDIR_VERSION=@prefix@
-- DATADIR=@localstatedir@
-- ledir=@libexecdir@
--fi
-+MY_BASEDIR_VERSION=@prefix@
-+DATADIR=@localstatedir@
-+ledir=@libexecdir@
-
- pid_file=$DATADIR/`@HOSTNAME@`.pid
- MYSQL_UNIX_PORT=@MYSQL_UNIX_ADDR@
-@@ -154,33 +137,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 xa | 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 xa | 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 "`date +'%y%m%d %H:%M:%S mysqld restarted'`" | tee -a $err_log
- done
diff --git a/databases/mysql50-server/files/patch-ap b/databases/mysql50-server/files/patch-ap
deleted file mode 100644
index 097b449a181a..000000000000
--- a/databases/mysql50-server/files/patch-ap
+++ /dev/null
@@ -1,11 +0,0 @@
---- strings/Makefile.in.orig Sat Jan 1 18:00:30 2000
-+++ strings/Makefile.in Mon Jan 3 17:21:19 2000
-@@ -145,7 +145,7 @@
- INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include
- pkglib_LIBRARIES = libmystrings.a
- #no assembler
--@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.s longlong2str-x86.s
-+@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.S longlong2str-x86.S
- @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@ASRCS = bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s strxmov-sparc.s
- @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@ASRCS =
- # These file MUST all be on the same line!! Otherwise automake
diff --git a/databases/mysql50-server/files/patch-aq b/databases/mysql50-server/files/patch-aq
deleted file mode 100644
index 573324175921..000000000000
--- a/databases/mysql50-server/files/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
---- sql/Makefile.in.orig Sat Jan 1 18:01:13 2000
-+++ sql/Makefile.in Wed Jan 5 20:28:17 2000
-@@ -317,6 +317,10 @@
- else :; fi
- sql_yacc.hh: sql_yacc.cc
-
-+# gcc takes a lot of memory and cpu time if it compiles sql_yacc.cc with -O
-+sql_yacc.o: sql_yacc.cc
-+ $(CXXCOMPILE) -O0 -c $<
-+
-
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
diff --git a/databases/mysql50-server/files/patch-as b/databases/mysql50-server/files/patch-as
deleted file mode 100644
index 903bc9950a28..000000000000
--- a/databases/mysql50-server/files/patch-as
+++ /dev/null
@@ -1,16 +0,0 @@
---- sql/mysqld.cc.orig Sun Feb 13 02:40:18 2000
-+++ sql/mysqld.cc Mon Feb 21 21:24:51 2000
-@@ -63,8 +63,11 @@
- inline void reset_floating_point_exceptions()
- {
- /* Don't fall for overflow, underflow,divide-by-zero or loss of precision */
-- fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL |
-- FP_X_DZ | FP_X_IMP));
-+#if defined(__i386__)
-+ fpsetmask(~(FP_X_INV | FP_X_DNML | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP));
-+#else
-+ fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | FP_X_IMP));
-+#endif
- }
- #else
- #define reset_floating_point_exceptions()
diff --git a/databases/mysql50-server/files/patch-configure b/databases/mysql50-server/files/patch-configure
deleted file mode 100644
index d96a5e9b3620..000000000000
--- a/databases/mysql50-server/files/patch-configure
+++ /dev/null
@@ -1,157 +0,0 @@
---- configure.orig Tue Oct 17 22:59:41 2000
-+++ configure Thu Oct 19 14:58:15 2000
-@@ -1069,7 +1069,7 @@
- PROTOCOL_VERSION=10
- DOT_FRM_VERSION=6
- # See the libtool docs for information on how to do shared lib versions.
--SHARED_LIB_VERSION=10:0:0
-+SHARED_LIB_VERSION=6:0:0
-
- # Set all version vars based on $VERSION. How do we do this more elegant ?
- # Remember that regexps needs to quote [ and ] since this is run through m4
-@@ -2949,7 +2949,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
-@@ -3077,35 +3077,7 @@
- echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
- echo "configure:3079: 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
-- case $SYSTEM_TYPE in
-- *darwin*)
-- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
-- ;;
-- *)
-- { 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; }
-- esac
--fi
-+FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
-
- echo "$ac_t"""$FIND_PROC"" 1>&6
-
-@@ -5411,8 +5383,6 @@
- #define $ac_tr_lib 1
- EOF
-
-- LIBS="-lc_r $LIBS"
--
- else
- echo "$ac_t""no" 1>&6
- fi
-@@ -5635,28 +5605,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="$MAX_C_OPTIMIZE"
--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"
-@@ -6337,10 +6285,6 @@
- ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cxx_cross
-
--if test "$ac_cv_prog_gxx" = "yes"
--then
-- CXXFLAGS="$CXXFLAGS -Werror"
--fi
- mysql_cv_btype_last_arg_accept=none
- cat > conftest.$ac_ext <<EOF
- #line 6347 "configure"
-@@ -8348,10 +8292,6 @@
- ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cxx_cross
-
--if test "$ac_cv_prog_gxx" = "yes"
--then
-- CXXFLAGS="$CXXFLAGS -Werror"
--fi
- cat > conftest.$ac_ext <<EOF
- #line 8357 "configure"
- #include "confdefs.h"
-@@ -8416,10 +8356,6 @@
- ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cxx_cross
-
--if test "$ac_cv_prog_gxx" = "yes"
--then
-- CXXFLAGS="$CXXFLAGS -Werror"
--fi
- cat > conftest.$ac_ext <<EOF
- #line 8425 "configure"
- #include "confdefs.h"
-@@ -8483,10 +8419,6 @@
- ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cxx_cross
-
--if test "$ac_cv_prog_gxx" = "yes"
--then
-- CXXFLAGS="$CXXFLAGS -Werror"
--fi
- cat > conftest.$ac_ext <<EOF
- #line 8492 "configure"
- #include "confdefs.h"
-@@ -8770,7 +8702,7 @@
- #include <pthread.h>
- int main() {
- pthread_attr_t thr_attr;
--pthread_attr_setscope(&thr_attr,0);
-+XXXpthread_attr_setscope(&thr_attr,0);
- ; return 0; }
- EOF
- if { (eval echo configure:8777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -9728,7 +9660,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
diff --git a/databases/mysql50-server/files/patch-include::Makefile.in b/databases/mysql50-server/files/patch-include::Makefile.in
deleted file mode 100644
index 225e54365394..000000000000
--- a/databases/mysql50-server/files/patch-include::Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- include/Makefile.in.orig Tue Oct 17 16:10:42 2000
-+++ include/Makefile.in Wed Nov 8 17:26:09 2000
-@@ -168,7 +168,7 @@
- uname_prog = @uname_prog@
-
- BUILT_SOURCES = mysql_version.h m_ctype.h
--pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h mysqld_error.h my_list.h my_pthread.h my_no_pthread.h raid.h errmsg.h my_global.h my_net.h sslopt-case.h sslopt-longopts.h sslopt-usage.h sslopt-vars.h $(BUILT_SOURCES)
-+pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h mysqld_error.h my_config.h my_list.h my_pthread.h my_no_pthread.h raid.h errmsg.h my_global.h my_net.h sslopt-case.h sslopt-longopts.h sslopt-usage.h sslopt-vars.h $(BUILT_SOURCES)
-
- noinst_HEADERS = global.h config-win.h nisam.h heap.h merge.h myisam.h myisampack.h myisammrg.h ft_global.h my_dir.h mysys_err.h my_base.h my_nosys.h my_alarm.h queues.h my_tree.h hash.h thr_alarm.h thr_lock.h getopt.h t_ctype.h violite.h mysql_version.h.in
-
-@@ -282,7 +282,11 @@
-
- install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+.if defined(CLIENT_ONLY)
- install: install-am
-+.else
-+install:
-+.endif
- uninstall-am: uninstall-pkgincludeHEADERS
- uninstall: uninstall-am
- all-am: Makefile $(HEADERS) all-local