Import mysql-server-3.23.58 into databases/mysql3-server.

13 files changed, 436 insertions, 0 deletions

diff --git a/databases/mysql3-server/DESCR b/databases/mysql3-server/DESCR
new file mode 100644
index 00000000000..02b7abc487b
--- /dev/null
+++ b/databases/mysql3-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/mysql3-server/INSTALL b/databases/mysql3-server/INSTALL
new file mode 100644
index 00000000000..940d1713ef9
--- /dev/null
+++ b/databases/mysql3-server/INSTALL
@@ -0,0 +1,11 @@
+# $NetBSD: INSTALL,v 1.1.1.1 2004/10/28 01:02:15 xtraeme Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+	${ECHO} "-------------------------------"
+	${ECHO} "Initializing MySQL databases..."
+	${ECHO} "-------------------------------"
+	${PKG_PREFIX}/bin/mysql_install_db --force
+	${CHOWN} -R @MYSQL_USER@:@MYSQL_GROUP@ @MYSQL_DATADIR@
+	;;
+esac
diff --git a/databases/mysql3-server/MESSAGE b/databases/mysql3-server/MESSAGE
new file mode 100644
index 00000000000..4be7d9fd102
--- /dev/null
+++ b/databases/mysql3-server/MESSAGE
@@ -0,0 +1,17 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1.1.1 2004/10/28 01:02:15 xtraeme 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.)
+
+See the manual for more instructions.
+
+===========================================================================
diff --git a/databases/mysql3-server/Makefile b/databases/mysql3-server/Makefile
new file mode 100644
index 00000000000..590adab09d1
--- /dev/null
+++ b/databases/mysql3-server/Makefile
@@ -0,0 +1,65 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/10/28 01:02:16 xtraeme Exp $
+
+PKGNAME=		${DISTNAME:S/-/-server-/}
+PKGREVISION=	1
+SVR4_PKGNAME=		mysqs
+COMMENT=		MySQL 3, a free SQL database (server)
+
+.include "../../databases/mysql-client/Makefile.common"
+
+CONFIGURE_ARGS+=	--without-berkeley-db
+USE_BUILDLINK3=		YES
+USE_GNU_TOOLS+=		make
+
+USE_PKGINSTALL=		YES
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+
+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}
+FILES_SUBST+=		MYSQL_USER=${MYSQL_USER}
+FILES_SUBST+=		MYSQL_GROUP=${MYSQL_GROUP}
+MESSAGE_SUBST+=		MYSQL_DATADIR=${MYSQL_DATADIR} \
+			MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
+BUILD_DEFS+=		MYSQL_DATADIR
+OWN_DIRS_PERMS+=	${MYSQL_DATADIR} ${MYSQL_USER} ${MYSQL_GROUP} 0700
+
+# XXX TCP wrapper support is broken on (at least) Linux and Solaris.
+# ref: http://bugs.mysql.com/bug.php?id=599
+#      http://mail-index.netbsd.org/tech-pkg/2003/08/07/0003.html
+.if ${OPSYS} != "Linux" && ${OPSYS} != "SunOS"
+CONFIGURE_ARGS+=	--with-libwrap
+.  include "../../security/tcp_wrappers/buildlink3.mk"
+.endif
+
+post-configure:
+	cd ${WRKSRC} && ${CP} -f config.h include/my_config.h
+
+post-build:
+	cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}	\
+		${MAKE_FLAGS} safe_mysqld mysql_install_db
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/safe_mysqld ${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/safe_mysqld.1 ${PREFIX}/man/man1
+
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../databases/mysql-client/buildlink3.mk"
+
+.if ${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/mysql3-server/PLIST b/databases/mysql3-server/PLIST
new file mode 100644
index 00000000000..8ade32c9631
--- /dev/null
+++ b/databases/mysql3-server/PLIST
@@ -0,0 +1,121 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/28 01:02:16 xtraeme Exp $
+bin/comp_err
+bin/isamchk
+bin/isamlog
+bin/my_print_defaults
+bin/myisamchk
+bin/myisamlog
+bin/myisampack
+bin/mysql.server
+bin/mysql_install_db
+bin/pack_isam
+bin/perror
+bin/replace
+bin/resolve_stack_dump
+bin/resolveip
+bin/safe_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
+libexec/mysqld
+man/man1/mysqld.1
+man/man1/safe_mysqld.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/mysql3-server/distinfo b/databases/mysql3-server/distinfo
new file mode 100644
index 00000000000..7d7cb5be963
--- /dev/null
+++ b/databases/mysql3-server/distinfo
@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/10/28 01:02:16 xtraeme Exp $
+
+SHA1 (mysql-3.23.58.tar.gz) = f3383e41e8926c040a295173881414a1e96e0266
+Size (mysql-3.23.58.tar.gz) = 12039843 bytes
+SHA1 (patch-aa) = 3954608e14c5c7996e699dc3dc083cf93d5944c7
+SHA1 (patch-ab) = 026fe468b4d7517084eea74ae14e115861d7d552
+SHA1 (patch-ae) = 127fb44f62f351236e4f36609f8d3af7469e67cd
+SHA1 (patch-af) = 53d0c68891918e9b0a21a9e30bf4b36aec44d2b8
+SHA1 (patch-al) = 4dea01ae58df622706887c59f303ffaf38384393
+SHA1 (patch-am) = 8e4398480701eb38193babdeac59572cdadbd4ea
diff --git a/databases/mysql3-server/files/mysqld.sh b/databases/mysql3-server/files/mysqld.sh
new file mode 100644
index 00000000000..4307e274f6f
--- /dev/null
+++ b/databases/mysql3-server/files/mysqld.sh
@@ -0,0 +1,31 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: mysqld.sh,v 1.1.1.1 2004/10/28 01:02:16 xtraeme 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/safe_mysqld"
+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/mysql3-server/patches/patch-aa b/databases/mysql3-server/patches/patch-aa
new file mode 100644
index 00000000000..914e6ce31fc
--- /dev/null
+++ b/databases/mysql3-server/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/10/28 01:02:16 xtraeme Exp $
+
+--- Makefile.in.orig	Thu Mar 13 20:32:20 2003
++++ Makefile.in	Fri Apr 11 13:57:27 2003
+@@ -195,10 +195,7 @@
+ EXTRA_DIST = INSTALL-SOURCE README \
+ 			COPYING COPYING.LIB
+ 
+-SUBDIRS = . include @docs_dirs@ @readline_dir@ \
+-			@thread_dirs@ @sql_client_dirs@ \
+-			@sql_server_dirs@ scripts tests man \
+-			@bench_dirs@ support-files os2
++SUBDIRS = @thread_dirs@ @sql_server_dirs@ tests @bench_dirs@ support-files
+ 
+ 
+ # Relink after clean
diff --git a/databases/mysql3-server/patches/patch-ab b/databases/mysql3-server/patches/patch-ab
new file mode 100644
index 00000000000..3de14b7e811
--- /dev/null
+++ b/databases/mysql3-server/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/10/28 01:02:16 xtraeme Exp $
+
+--- support-files/Makefile.in.orig	Sun Feb 16 09:26:07 2003
++++ support-files/Makefile.in	Sun Feb 16 09:28:32 2003
+@@ -363,7 +363,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-pkgdataDATA install-pkgdataSCRIPTS
++install-data-am: install-pkgdataSCRIPTS
+ 
+ install-exec-am:
+ 
diff --git a/databases/mysql3-server/patches/patch-ae b/databases/mysql3-server/patches/patch-ae
new file mode 100644
index 00000000000..cfef20a7eaa
--- /dev/null
+++ b/databases/mysql3-server/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1.1.1 2004/10/28 01:02:17 xtraeme Exp $
+
+--- configure.in.orig	Thu Aug 28 13:20:55 2003
++++ configure.in	Thu Aug 28 13:23:04 2003
+@@ -1846,7 +1846,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/mysql3-server/patches/patch-af b/databases/mysql3-server/patches/patch-af
new file mode 100644
index 00000000000..cd032133607
--- /dev/null
+++ b/databases/mysql3-server/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1.1.1 2004/10/28 01:02:17 xtraeme Exp $
+
+--- configure.orig	Thu Aug 28 13:24:42 2003
++++ configure	Thu Aug 28 13:25:36 2003
+@@ -19952,7 +19952,6 @@
+ else
+   bench_dirs=""
+ fi
+-bench_dirs="$bench_dirs mysql-test"
+ 
+ 
+ # Don't build readline, i have it already
diff --git a/databases/mysql3-server/patches/patch-al b/databases/mysql3-server/patches/patch-al
new file mode 100644
index 00000000000..c6342945540
--- /dev/null
+++ b/databases/mysql3-server/patches/patch-al
@@ -0,0 +1,30 @@
+$NetBSD: patch-al,v 1.1.1.1 2004/10/28 01:02:17 xtraeme Exp $
+
+--- include/my_pthread.h.orig	Thu Aug 28 13:26:47 2003
++++ include/my_pthread.h	Thu Aug 28 13:28:45 2003
+@@ -20,7 +20,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
+@@ -294,7 +300,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/mysql3-server/patches/patch-am b/databases/mysql3-server/patches/patch-am
new file mode 100644
index 00000000000..3f7c2253616
--- /dev/null
+++ b/databases/mysql3-server/patches/patch-am
@@ -0,0 +1,83 @@
+$NetBSD: patch-am,v 1.1.1.1 2004/10/28 01:02:17 xtraeme Exp $
+
+--- scripts/safe_mysqld.sh.orig	Fri Apr 11 13:57:14 2003
++++ scripts/safe_mysqld.sh	Fri Apr 11 13:58:02 2003
+@@ -195,6 +195,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
+@@ -205,18 +213,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
+@@ -225,11 +231,11 @@
+ # Uncomment the following lines if you want all tables to be automaticly
+ # checked and repaired at start
+ #
+-# echo "Checking tables in $DATADIR"
++# datemsg "Checking tables in $DATADIR"
+ # $MY_BASEDIR_VERSION/bin/myisamchk --silent --force --fast --medium-check -O key_buffer=64M -O sort_buffer=64M $DATADIR/*/*.MYI
+ # $MY_BASEDIR_VERSION/bin/isamchk --silent --force -O sort_buffer=64M $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
+@@ -237,7 +243,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 $MYSQL_UNIX_PORT $pid_file	# Some extra safety
+@@ -260,7 +266,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 "Number of processes running now: $numofproces"
+     I=1
+     while test "$I" -le "$numofproces"
+     do 
+@@ -272,7 +278,7 @@
+ 	#    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