diff options
author | martti <martti> | 2003-12-20 16:00:42 +0000 |
---|---|---|
committer | martti <martti> | 2003-12-20 16:00:42 +0000 |
commit | 463ac13287c3a407b1b27e8e299dc5112cdae5dd (patch) | |
tree | 2ff775d5ebb576d665dad33ec7e3806dae7e831d /databases/mysql4-server | |
parent | 3799350b4642546b3a7c43312612cc17a5f8bb50 (diff) | |
download | pkgsrc-463ac13287c3a407b1b27e8e299dc5112cdae5dd.tar.gz |
MySQL is a SQL (Structured Query Language) database server. SQL is the
most popular database language in the world. MySQL is a client-server
implementation that consists of a server daemon `mysqld' and many
different client programs/libraries.
The main goals of MySQL are speed and robustness.
The base upon which MySQL is built is a set of routines that have been
used in a highly demanding production environment for many years. While
MySQL is still in development it already offers a rich and highly useful
function set.
The official way to pronounce 'MySQL' is 'My Ess Que Ell' (Not MY-SEQUEL).
This package contains the MySQL server programs and libraries.
Diffstat (limited to 'databases/mysql4-server')
-rw-r--r-- | databases/mysql4-server/DESCR | 15 | ||||
-rw-r--r-- | databases/mysql4-server/INSTALL | 10 | ||||
-rw-r--r-- | databases/mysql4-server/MESSAGE | 22 | ||||
-rw-r--r-- | databases/mysql4-server/Makefile | 61 | ||||
-rw-r--r-- | databases/mysql4-server/PLIST | 126 | ||||
-rw-r--r-- | databases/mysql4-server/distinfo | 14 | ||||
-rw-r--r-- | databases/mysql4-server/files/mysqld.sh | 31 | ||||
-rw-r--r-- | databases/mysql4-server/patches/patch-aa | 18 | ||||
-rw-r--r-- | databases/mysql4-server/patches/patch-ae | 12 | ||||
-rw-r--r-- | databases/mysql4-server/patches/patch-af | 40 | ||||
-rw-r--r-- | databases/mysql4-server/patches/patch-al | 30 | ||||
-rw-r--r-- | databases/mysql4-server/patches/patch-am | 93 | ||||
-rw-r--r-- | databases/mysql4-server/patches/patch-aq | 20 | ||||
-rw-r--r-- | databases/mysql4-server/patches/patch-ar | 13 | ||||
-rw-r--r-- | databases/mysql4-server/patches/patch-as | 21 | ||||
-rw-r--r-- | databases/mysql4-server/patches/patch-at | 17 | ||||
-rw-r--r-- | databases/mysql4-server/patches/patch-au | 13 |
17 files changed, 556 insertions, 0 deletions
diff --git a/databases/mysql4-server/DESCR b/databases/mysql4-server/DESCR new file mode 100644 index 00000000000..02b7abc487b --- /dev/null +++ b/databases/mysql4-server/DESCR @@ -0,0 +1,15 @@ +MySQL is a SQL (Structured Query Language) database server. SQL is the +most popular database language in the world. MySQL is a client-server +implementation that consists of a server daemon `mysqld' and many +different client programs/libraries. + +The main goals of MySQL are speed and robustness. + +The base upon which MySQL is built is a set of routines that have been +used in a highly demanding production environment for many years. While +MySQL is still in development it already offers a rich and highly useful +function set. + +The official way to pronounce 'MySQL' is 'My Ess Que Ell' (Not MY-SEQUEL). + +This package contains the MySQL server programs and libraries. diff --git a/databases/mysql4-server/INSTALL b/databases/mysql4-server/INSTALL new file mode 100644 index 00000000000..63e9e44163f --- /dev/null +++ b/databases/mysql4-server/INSTALL @@ -0,0 +1,10 @@ +# $NetBSD: INSTALL,v 1.1.1.1 2003/12/20 16:00:42 martti Exp $ + +case ${STAGE} in +POST-INSTALL) + ${ECHO} "-------------------------------" + ${ECHO} "Initializing MySQL databases..." + ${ECHO} "-------------------------------" + ${PKG_PREFIX}/bin/mysql_install_db --force + ;; +esac diff --git a/databases/mysql4-server/MESSAGE b/databases/mysql4-server/MESSAGE new file mode 100644 index 00000000000..08d805e0508 --- /dev/null +++ b/databases/mysql4-server/MESSAGE @@ -0,0 +1,22 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1.1.1 2003/12/20 16:00:42 martti Exp $ + +The MySQL directory `${MYSQL_DATADIR}' should be owned by the +user `${MYSQL_USER}' and group `${MYSQL_GROUP}'. This can be done with: + chown -R ${MYSQL_USER}:${MYSQL_GROUP} ${MYSQL_DATADIR} + + +If this is a new installation, please remember to set a password for +the MySQL root user! This is done by running both: + ${PREFIX}/bin/mysqladmin -u root -p password 'new-password' + ${PREFIX}/bin/mysqladmin -h `hostname` -u root -p password 'new-password' +(The "Enter password:" prompt is asking for the existing password. +As there is no existing password, just press Return.) + +There is now a script distributed with mysql that can help you lock +down an installation. This script has been installed to +${PREFIX}/bin/mysql_secure_installation. + +See the manual and the mysql web site for more instructions. + +=========================================================================== diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile new file mode 100644 index 00000000000..4cc8df440a8 --- /dev/null +++ b/databases/mysql4-server/Makefile @@ -0,0 +1,61 @@ +# $NetBSD: Makefile,v 1.1.1.1 2003/12/20 16:00:42 martti Exp $ + +PKGNAME= ${DISTNAME:S/-/-server-/} +SVR4_PKGNAME= mysqs +COMMENT= MySQL, a free SQL database (server) + +.include "../mysql4-client/Makefile.common" + +CONFIGURE_ARGS+= --with-libwrap +CONFIGURE_ARGS+= --without-berkeley-db +CONFIGURE_ARGS+= --without-mysqlfs +USE_BUILDLINK2= YES +USE_PKGINSTALL= YES + +INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL + +CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*} + +PTHREAD_OPTS= require + +CONFIGURE_ARGS+= --with-pthreads + +PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\\ database\\ administrator:${MYSQL_DATADIR}:${SH} +PKG_GROUPS= ${MYSQL_GROUP} +RCD_SCRIPTS= mysqld +CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER} +FILES_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} +MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} \ + MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP} +BUILD_DEFS+= MYSQL_DATADIR +MAKE_DIRS_PERMS+= ${MYSQL_DATADIR} ${MYSQL_USER} ${MYSQL_GROUP} 0700 + +post-configure: + cd ${WRKSRC} && ${CP} -f config.h include/my_config.h + +post-build: + cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \ + ${MAKE_FLAGS} mysqld_safe mysql_install_db + +post-install: + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysqld_safe ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_install_db ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/support-files/mysql.server ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/man/mysqld.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/mysqld_multi.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/mysqld_safe.1 ${PREFIX}/man/man1 + PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL + ${CHOWN} -R ${MYSQL_USER}:${MYSQL_GROUP} ${MYSQL_DATADIR} + +.include "../../databases/mysql4-client/buildlink2.mk" +.include "../../security/tcp_wrappers/buildlink2.mk" +.include "../../mk/pthread.buildlink2.mk" + +.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") +CFLAGS+= -DSIGNALS_DONT_BREAK_READ +CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ +CONFIGURE_ENV+= ac_cv_func_pthread_setschedparam=no +CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no +.endif + +.include "../../mk/bsd.pkg.mk" diff --git a/databases/mysql4-server/PLIST b/databases/mysql4-server/PLIST new file mode 100644 index 00000000000..92dd77f2eac --- /dev/null +++ b/databases/mysql4-server/PLIST @@ -0,0 +1,126 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/20 16:00:42 martti Exp $ +bin/comp_err +bin/isamchk +bin/isamlog +bin/my_print_defaults +bin/myisamchk +bin/myisamlog +bin/myisampack +bin/mysql.server +bin/mysql_install +bin/mysql_install_db +bin/mysql_waitpid +bin/mysqld_safe +bin/pack_isam +bin/perror +bin/replace +bin/resolve_stack_dump +bin/resolveip +etc/rc.d/mysqld +lib/mysql/libdbug.a +lib/mysql/libheap.a +lib/mysql/libmerge.a +lib/mysql/libmyisam.a +lib/mysql/libmyisammrg.a +lib/mysql/libmystrings.a +lib/mysql/libmysys.a +lib/mysql/libnisam.a +lib/mysql/libvio.a +libexec/mysqld +man/man1/mysqld.1 +man/man1/mysqld_multi.1 +man/man1/mysqld_safe.1 +share/mysql/charsets/Index +share/mysql/charsets/README +share/mysql/charsets/cp1251.conf +share/mysql/charsets/cp1257.conf +share/mysql/charsets/croat.conf +share/mysql/charsets/danish.conf +share/mysql/charsets/dec8.conf +share/mysql/charsets/dos.conf +share/mysql/charsets/estonia.conf +share/mysql/charsets/german1.conf +share/mysql/charsets/greek.conf +share/mysql/charsets/hebrew.conf +share/mysql/charsets/hp8.conf +share/mysql/charsets/hungarian.conf +share/mysql/charsets/koi8_ru.conf +share/mysql/charsets/koi8_ukr.conf +share/mysql/charsets/latin1.conf +share/mysql/charsets/latin2.conf +share/mysql/charsets/latin5.conf +share/mysql/charsets/swe7.conf +share/mysql/charsets/usa7.conf +share/mysql/charsets/win1250.conf +share/mysql/charsets/win1251.conf +share/mysql/charsets/win1251ukr.conf +share/mysql/czech/errmsg.sys +share/mysql/czech/errmsg.txt +share/mysql/danish/errmsg.sys +share/mysql/danish/errmsg.txt +share/mysql/dutch/errmsg.sys +share/mysql/dutch/errmsg.txt +share/mysql/english/errmsg.sys +share/mysql/english/errmsg.txt +share/mysql/estonian/errmsg.sys +share/mysql/estonian/errmsg.txt +share/mysql/french/errmsg.sys +share/mysql/french/errmsg.txt +share/mysql/german/errmsg.sys +share/mysql/german/errmsg.txt +share/mysql/greek/errmsg.sys +share/mysql/greek/errmsg.txt +share/mysql/hungarian/errmsg.sys +share/mysql/hungarian/errmsg.txt +share/mysql/italian/errmsg.sys +share/mysql/italian/errmsg.txt +share/mysql/japanese/errmsg.sys +share/mysql/japanese/errmsg.txt +share/mysql/korean/errmsg.sys +share/mysql/korean/errmsg.txt +share/mysql/mi_test_all +share/mysql/mi_test_all.res +share/mysql/mysql.server +share/mysql/norwegian-ny/errmsg.sys +share/mysql/norwegian-ny/errmsg.txt +share/mysql/norwegian/errmsg.sys +share/mysql/norwegian/errmsg.txt +share/mysql/polish/errmsg.sys +share/mysql/polish/errmsg.txt +share/mysql/portuguese/errmsg.sys +share/mysql/portuguese/errmsg.txt +share/mysql/romanian/errmsg.sys +share/mysql/romanian/errmsg.txt +share/mysql/russian/errmsg.sys +share/mysql/russian/errmsg.txt +share/mysql/slovak/errmsg.sys +share/mysql/slovak/errmsg.txt +share/mysql/spanish/errmsg.sys +share/mysql/spanish/errmsg.txt +share/mysql/swedish/errmsg.sys +share/mysql/swedish/errmsg.txt +share/mysql/ukrainian/errmsg.sys +share/mysql/ukrainian/errmsg.txt +@dirrm share/mysql/ukrainian +@dirrm share/mysql/swedish +@dirrm share/mysql/spanish +@dirrm share/mysql/slovak +@dirrm share/mysql/russian +@dirrm share/mysql/romanian +@dirrm share/mysql/portuguese +@dirrm share/mysql/polish +@dirrm share/mysql/norwegian-ny +@dirrm share/mysql/norwegian +@dirrm share/mysql/korean +@dirrm share/mysql/japanese +@dirrm share/mysql/italian +@dirrm share/mysql/hungarian +@dirrm share/mysql/greek +@dirrm share/mysql/german +@dirrm share/mysql/french +@dirrm share/mysql/estonian +@dirrm share/mysql/english +@dirrm share/mysql/dutch +@dirrm share/mysql/danish +@dirrm share/mysql/czech +@dirrm share/mysql/charsets diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo new file mode 100644 index 00000000000..e1d67827288 --- /dev/null +++ b/databases/mysql4-server/distinfo @@ -0,0 +1,14 @@ +$NetBSD: distinfo,v 1.1.1.1 2003/12/20 16:00:42 martti Exp $ + +SHA1 (mysql-4.0.17.tar.gz) = b2588d2ccc9d2683e874e7c5cb4d9c55c2196b9e +Size (mysql-4.0.17.tar.gz) = 12959051 bytes +SHA1 (patch-aa) = fac3a4b96d32c4022d459b042c1f40b393a2719f +SHA1 (patch-ae) = d5dcade3dea37c2f9be12bbddf6091ddb57344ac +SHA1 (patch-af) = 87b5682c33ef2a05a0958ccacba7038273f66bca +SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96 +SHA1 (patch-am) = 822bad2bcfd94e0277c28ff31a84b6af770a0806 +SHA1 (patch-aq) = 9b3612a95f4409dc062951fbc2636df63d7b7998 +SHA1 (patch-ar) = dfb126a4cca3bb6fd06608222277ed8773b3d34d +SHA1 (patch-as) = 3e2266ce1942715a21ae1e686b162c198811fb49 +SHA1 (patch-at) = 459e33b9e06f3ffc78d5dfc7e43068eb10e21b0d +SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91 diff --git a/databases/mysql4-server/files/mysqld.sh b/databases/mysql4-server/files/mysqld.sh new file mode 100644 index 00000000000..7ae04dd072b --- /dev/null +++ b/databases/mysql4-server/files/mysqld.sh @@ -0,0 +1,31 @@ +#!@RCD_SCRIPTS_SHELL@ +# +# $NetBSD: mysqld.sh,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $ +# + +# PROVIDE: mysqld +# REQUIRE: DAEMON LOGIN mountall +# KEYWORD: shutdown + +# Note: this needs NetBSD 1.6 or newer +# + +. /etc/rc.subr + +name="mysqld" +rcvar=$name +command="@PREFIX@/bin/mysqld_safe" +procname="@PREFIX@/libexec/${name}" +pidfile="@MYSQL_DATADIR@/`hostname`.pid" +start_cmd="mysqld_start" +required_files="@MYSQL_DATADIR@/mysql/host.frm" + +mysqld_start() +{ + echo "Starting mysqld." + ulimit -n 4096 + ${command} ${mysqld_flags} & +} + +load_rc_config $name +run_rc_command "$1" diff --git a/databases/mysql4-server/patches/patch-aa b/databases/mysql4-server/patches/patch-aa new file mode 100644 index 00000000000..9f603af02df --- /dev/null +++ b/databases/mysql4-server/patches/patch-aa @@ -0,0 +1,18 @@ +$NetBSD: patch-aa,v 1.1.1.1 2003/12/20 16:00:42 martti Exp $ + +--- Makefile.in.orig 2003-12-14 21:24:01.000000000 +0000 ++++ Makefile.in 2003-12-20 12:08:19.000000000 +0000 +@@ -210,11 +210,8 @@ + + # These are built from source in the Docs directory + EXTRA_DIST = INSTALL-SOURCE README COPYING +-SUBDIRS = . include @docs_dirs@ @readline_dir@ \ +- @thread_dirs@ pstack @sql_client_dirs@ \ +- @sql_server_dirs@ scripts man tests \ +- BUILD @netware_dir@ os2 @libmysqld_dirs@ \ +- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ ++SUBDIRS = . include @thread_dirs@ pstack @sql_server_dirs@ \ ++ tests @bench_dirs@ support-files + + + # Relink after clean diff --git a/databases/mysql4-server/patches/patch-ae b/databases/mysql4-server/patches/patch-ae new file mode 100644 index 00000000000..e3a7116a329 --- /dev/null +++ b/databases/mysql4-server/patches/patch-ae @@ -0,0 +1,12 @@ +$NetBSD: patch-ae,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $ + +--- configure.in.orig 2003-12-14 21:23:49.000000000 +0000 ++++ configure.in 2003-12-20 12:08:47.000000000 +0000 +@@ -2159,7 +2159,6 @@ + else + bench_dirs="" + fi +-bench_dirs="$bench_dirs mysql-test" + AC_SUBST(bench_dirs) + + # Don't build readline, i have it already diff --git a/databases/mysql4-server/patches/patch-af b/databases/mysql4-server/patches/patch-af new file mode 100644 index 00000000000..32a3c9f7bca --- /dev/null +++ b/databases/mysql4-server/patches/patch-af @@ -0,0 +1,40 @@ +$NetBSD: patch-af,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $ + +--- configure.orig 2003-12-14 21:24:06.000000000 +0000 ++++ configure 2003-12-20 12:09:09.000000000 +0000 +@@ -20886,27 +20886,11 @@ + + echo "$as_me:$LINENO: checking for ORBit" >&5 + echo $ECHO_N "checking for ORBit... $ECHO_C" >&6 +-orbit_config_path=`which orbit-config` +-if test -n "$orbit_config_path" -a $? = 0 +-then +- orbit_exec_prefix=`orbit-config --exec-prefix` +- orbit_includes=`orbit-config --cflags server` +- orbit_libs=`orbit-config --libs server` +- orbit_idl="$orbit_exec_prefix/bin/orbit-idl" +- echo "$as_me:$LINENO: result: found!" >&5 +-echo "${ECHO_T}found!" >&6 +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_ORBIT 1 +-_ACEOF +- +-else + orbit_exec_prefix= + orbit_includes= + orbit_libs= + orbit_idl= + echo "$as_me:$LINENO: result: not found" >&5 +-echo "${ECHO_T}not found" >&6 +-fi + + + +@@ -21140,7 +21124,6 @@ + else + bench_dirs="" + fi +-bench_dirs="$bench_dirs mysql-test" + + + # Don't build readline, i have it already diff --git a/databases/mysql4-server/patches/patch-al b/databases/mysql4-server/patches/patch-al new file mode 100644 index 00000000000..e486b1ae93f --- /dev/null +++ b/databases/mysql4-server/patches/patch-al @@ -0,0 +1,30 @@ +$NetBSD: patch-al,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $ + +--- include/my_pthread.h.orig 2003-12-14 21:23:47.000000000 +0000 ++++ include/my_pthread.h 2003-12-20 12:09:31.000000000 +0000 +@@ -19,7 +19,13 @@ + #ifndef _my_pthread_h + #define _my_pthread_h + ++/* defines __NetBSD_Version__ */ ++#if defined(__NetBSD__) ++#include <sys/param.h> ++#endif ++ + #include <errno.h> ++#include <signal.h> + #ifndef ETIME + #define ETIME ETIMEDOUT /* For FreeBSD */ + #endif +@@ -301,7 +307,11 @@ + #endif + + #ifndef HAVE_NONPOSIX_SIGWAIT ++#if defined (__NetBSD__) && (__NetBSD_Version__ < 106130000) ++#define my_sigwait(A,B) __pthread_sigwait((A),(B)) ++#else + #define my_sigwait(A,B) sigwait((A),(B)) ++#endif + #else + int my_sigwait(const sigset_t *set,int *sig); + #endif diff --git a/databases/mysql4-server/patches/patch-am b/databases/mysql4-server/patches/patch-am new file mode 100644 index 00000000000..96a46dac781 --- /dev/null +++ b/databases/mysql4-server/patches/patch-am @@ -0,0 +1,93 @@ +$NetBSD: patch-am,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $ + +--- scripts/mysqld_safe.sh.orig Tue Nov 25 10:11:07 2003 ++++ scripts/mysqld_safe.sh Tue Nov 25 10:16:51 2003 +@@ -251,6 +251,14 @@ + fi + fi + ++datemsg() ++{ ++ echo -n $(date +'%y%M%d %H:%M:%S')" " ++ echo "$*" ++} ++ ++exec >>$err_log 2>&1 ++ + # + # If there exists an old pid file, check if the daemon is already running + # Note: The switches to 'ps' may depend on your operating system +@@ -261,18 +269,16 @@ + then + if @FIND_PROC@ + then # The pid contains a mysqld process +- echo "A mysqld process already exists" +- echo "A mysqld process already exists at " `date` >> $err_log ++ datemsg "A mysqld process already exists" + exit 1 + fi + fi + rm -f $pid_file + if test -f $pid_file + then +- echo "Fatal error: Can't remove the pid file: $pid_file" +- echo "Fatal error: Can't remove the pid file: $pid_file at " `date` >> $err_log +- echo "Please remove it manually and start $0 again" +- echo "mysqld daemon not started" ++ datemsg "Fatal error: Can't remove the pid file: $pid_file" ++ datemsg "Please remove it manually and start $0 again" ++ datemsg "mysqld daemon not started" + exit 1 + fi + fi +@@ -285,11 +291,11 @@ + # Alternatively, you can start mysqld with the "myisam-recover" option. See + # the manual for details. + # +-# echo "Checking tables in $DATADIR" ++# datemsg "Checking tables in $DATADIR" + # $MY_BASEDIR_VERSION/bin/myisamchk --silent --force --fast --medium-check $DATADIR/*/*.MYI + # $MY_BASEDIR_VERSION/bin/isamchk --silent --force $DATADIR/*/*.ISM + +-echo "Starting $MYSQLD daemon with databases from $DATADIR" ++datemsg "Starting $MYSQLD daemon with databases from $DATADIR" + + # Does this work on all systems? + #if type ulimit | grep "shell builtin" > /dev/null +@@ -297,7 +303,7 @@ + # ulimit -n 256 > /dev/null 2>&1 # Fix for BSD and FreeBSD systems + #fi + +-echo "`date +'%y%m%d %H:%M:%S mysqld started'`" >> $err_log ++datemsg "mysqld started" + while true + do + rm -f $safe_mysql_unix_port $pid_file # Some extra safety +@@ -320,7 +326,7 @@ + # 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 ++ datemsg -e "\nNumber of processes running now: $numofproces" + I=1 + while test "$I" -le "$numofproces" + do +@@ -332,15 +338,14 @@ + # echo "TEST $I - $T **" + if kill -9 $T + then +- echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log ++ datemsg "$MYSQLD process hanging, pid $T - killed" + else + break + fi + I=`expr $I + 1` + done + fi +- echo "`date +'%y%m%d %H:%M:%S'` mysqld restarted" | tee -a $err_log ++ datemsg "mysqld restarted" + done + +-echo "`date +'%y%m%d %H:%M:%S'` mysqld ended" | tee -a $err_log +-echo "" | tee -a $err_log ++datemsg "mysqld ended" diff --git a/databases/mysql4-server/patches/patch-aq b/databases/mysql4-server/patches/patch-aq new file mode 100644 index 00000000000..b4ca2622c01 --- /dev/null +++ b/databases/mysql4-server/patches/patch-aq @@ -0,0 +1,20 @@ +$NetBSD: patch-aq,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $ + +--- include/Makefile.in.orig Mon Oct 13 17:24:51 2003 ++++ include/Makefile.in Mon Oct 13 17:30:05 2003 +@@ -205,13 +205,8 @@ + vio_dir = @vio_dir@ + vio_libs = @vio_libs@ + +-BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h +-pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h \ +- mysql.h mysql_com.h mysqld_error.h mysql_embed.h \ +- my_semaphore.h my_pthread.h my_no_pthread.h raid.h \ +- errmsg.h my_global.h my_net.h my_alloc.h \ +- my_getopt.h sslopt-longopts.h my_dir.h \ +- sslopt-vars.h sslopt-case.h $(BUILT_SOURCES) ++BUILT_SOURCES = ++pkginclude_HEADERS = $(BUILT_SOURCES) + + noinst_HEADERS = config-win.h config-os2.h config-netware.h \ + nisam.h heap.h merge.h my_bitmap.h\ diff --git a/databases/mysql4-server/patches/patch-ar b/databases/mysql4-server/patches/patch-ar new file mode 100644 index 00000000000..717ed5213aa --- /dev/null +++ b/databases/mysql4-server/patches/patch-ar @@ -0,0 +1,13 @@ +$NetBSD: patch-ar,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $ + +--- man/Makefile.in.orig Mon Oct 13 17:44:31 2003 ++++ man/Makefile.in Mon Oct 13 17:44:50 2003 +@@ -207,7 +207,7 @@ + + man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \ + mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ +- perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1 ++ perror.1 replace.1 mysql_fix_privilege_tables.1 + + + EXTRA_DIST = $(man_MANS) diff --git a/databases/mysql4-server/patches/patch-as b/databases/mysql4-server/patches/patch-as new file mode 100644 index 00000000000..42d9706b3e9 --- /dev/null +++ b/databases/mysql4-server/patches/patch-as @@ -0,0 +1,21 @@ +$NetBSD: patch-as,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $ + +--- support-files/Makefile.in.orig Mon Oct 13 17:48:34 2003 ++++ support-files/Makefile.in Mon Oct 13 17:50:44 2003 +@@ -219,15 +219,7 @@ + + SUBDIRS = MacOSX + +-pkgdata_DATA = my-small.cnf \ +- my-medium.cnf \ +- my-large.cnf \ +- my-huge.cnf \ +- mysql-log-rotate \ +- mysql-@VERSION@.spec \ +- binary-configure \ +- MySQL-shared-compat.spec +- ++pkgdata_DATA = + + pkgdata_SCRIPTS = mysql.server + diff --git a/databases/mysql4-server/patches/patch-at b/databases/mysql4-server/patches/patch-at new file mode 100644 index 00000000000..f501015e1d0 --- /dev/null +++ b/databases/mysql4-server/patches/patch-at @@ -0,0 +1,17 @@ +$NetBSD: patch-at,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $ + +--- support-files/MacOSX/Makefile.in.orig Mon Oct 13 17:53:21 2003 ++++ support-files/MacOSX/Makefile.in Mon Oct 13 17:53:55 2003 +@@ -217,11 +217,7 @@ + StartupItem.postinstall + + +-pkgdata_DATA = Info.plist \ +- Description.plist \ +- StartupParameters.plist \ +- postinstall \ +- preinstall ++pkgdata_DATA = + + + CLEANFILES = Info.plist \ diff --git a/databases/mysql4-server/patches/patch-au b/databases/mysql4-server/patches/patch-au new file mode 100644 index 00000000000..91b6f7efcec --- /dev/null +++ b/databases/mysql4-server/patches/patch-au @@ -0,0 +1,13 @@ +$NetBSD: patch-au,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $ + +--- include/my_global.h.orig 2003-10-17 07:29:15.000000000 +0200 ++++ include/my_global.h 2003-12-11 15:13:14.000000000 +0100 +@@ -250,7 +250,7 @@ + # endif + #endif /* TIME_WITH_SYS_TIME */ + #ifdef HAVE_UNISTD_H +-#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) ++#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) && !defined(__NetBSD__) + #define crypt unistd_crypt + #endif + #include <unistd.h> |