head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.36 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.34 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.32 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.30 pkgsrc-2011Q2-base:1.7 pkgsrc-2009Q4:1.7.0.28 pkgsrc-2009Q4-base:1.7 pkgsrc-2008Q4:1.7.0.26 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.24 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.22 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.20 pkgsrc-2008Q2-base:1.7 pkgsrc-2008Q1:1.7.0.18 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.16 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.14 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.12 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.10 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.8 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.6 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.4 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.2 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.6.0.10 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.8 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.6 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.4 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.2 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.4.0.8 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.6 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.4 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.2 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.3.0.2 netbsd-1-6-1-base:1.3 buildlink2-base:1.2 comdex-fall-1999:1.1.1.1 netbsd-1-4-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.7 date 2006.01.07.10.36.12; author ghen; state dead; branches; next 1.6; 1.6 date 2004.11.09.06.11.48; author xtraeme; state Exp; branches; next 1.5; 1.5 date 2004.10.28.01.08.15; author xtraeme; state Exp; branches; next 1.4; 1.4 date 2003.10.05.17.55.34; author martti; state Exp; branches; next 1.3; 1.3 date 2003.01.21.06.02.42; author lukem; state Exp; branches; next 1.2; 1.2 date 99.12.13.20.36.24; author bad; state dead; branches; next 1.1; 1.1 date 99.05.06.23.37.01; author tv; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.05.06.23.37.01; author tv; state Exp; branches; next ; desc @@ 1.7 log @Remove mysql-server and mysql-client (versions 4.0.26), because 1) they will not be maintained anymore 2) their package directory names where confusing (mysql4-* have a more recent version) These package directories may be used for meta-pkgs in the future (pulling in the latest mysql?-* packages). @ text @$NetBSD: patch-am,v 1.6 2004/11/09 06:11:48 xtraeme Exp $ --- scripts/mysqld_safe.sh.orig 2004-11-09 06:54:47.000000000 +0100 +++ scripts/mysqld_safe.sh 2004-11-09 06:57:33.000000000 +0100 @@@@ -253,6 +253,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 @@@@ -263,18 +271,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 @@@@ -287,11 +293,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 @@@@ -299,7 +305,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 @@@@ -311,7 +317,7 @@@@ fi if test ! -f $pid_file # This is removed if normal shutdown then - echo "STOPPING server from pid file $pid_file" + datemsg "STOPPING server from pid file $pid_file" break fi @@@@ -324,7 +330,7 @@@@ # kill -9 is used or the process won't react on the kill. numofproces=`ps xa | grep -v "grep" | grep "$ledir/$MYSQLD\>" | grep -c "pid-file=$pid_file"` - 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 @@@@ -337,16 +343,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" @ 1.6 log @Update mysql-{client,server} to 4.0.22. Functionality added or changed: * The --with-openssl option for configure now accepts a path prefix as an argument. --with-openssl-includes and --with-openssl-libs are still supported, but are needed only to override the default values. (Bug #5494) * Added new --without-man option to configure to suppress building/installing the manual pages. (Bug #5379) * InnoDB: New mysqld option --innodb-table-locks and session variable innodb_table_locks (on by default). In applications using AUTOCOMMIT=1, InnoDB's internal table locks can cause deadlocks. You can set innodb_table_locks=0 in `my.cnf' to remove that problem. See section 16.17 Restrictions on InnoDB Tables. (Bug #3299, Bug #5998) * InnoDB: Added the startup option and settable global variable innodb_max_purge_lag for delaying INSERT, UPDATE and DELETE operations when the purge operations are lagging. The default value of this parameter is zero, meaning that there will not be any delays. See section 16.13 Implementation of Multi-Versioning. * InnoDB: Change error code to HA_ERR_ROW_IS_REFERENCED if we cannot DROP a parent table because it is referenced by a FOREIGN KEY constraint. And a lot of bugfixes: http://dev.mysql.com/doc/mysql/en/News-4.0.22.html @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Update mysql-{client,server} to 4.0.21 (previously mysql4-*). @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.3 2004/10/22 01:10:04 xtraeme Exp $ d3 2 a4 2 --- scripts/mysqld_safe.sh.orig 2004-10-22 02:35:28.000000000 +0200 +++ scripts/mysqld_safe.sh 2004-10-22 02:38:30.000000000 +0200 d62 1 a62 1 +datemsg "mysqld started" d75 3 a77 3 @@@@ -329,7 +335,7 @@@@ numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD` fi d80 1 a80 1 + datemsg -e "\nNumber of processes running now: $numofproces" d84 10 a93 10 @@@@ -347,15 +353,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` d102 1 @ 1.4 log @Updated mysql-server to 3.23.58 A lot of bug and security fixes since 3.23.51... @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.3 2003/01/21 06:02:42 lukem Exp $ d3 3 a5 3 --- 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 @@@@ d20 1 a20 1 @@@@ -205,18 +213,16 @@@@ d26 1 a26 1 + datemsg "A mysqld process already exists" d37 3 a39 3 + 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" d43 3 a45 3 @@@@ -225,11 +231,11 @@@@ # Uncomment the following lines if you want all tables to be automaticly # checked and repaired at start d49 2 a50 2 # $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 d57 1 a57 1 @@@@ -237,7 +243,7 @@@@ d65 14 a78 5 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` d80 1 a80 1 + datemsg "Number of processes running now: $numofproces" d84 1 a84 1 @@@@ -272,7 +278,7 @@@@ d89 1 a89 1 + datemsg "$MYSQLD process hanging, pid $T - killed" d93 10 @ 1.3 log @- add rc.d script; based on [pkg/19055], with rework by me. - add support for MYSQL_USER and MYSQL_GROUP (user & group to run database as) - change ownership of $MYSQL_DATADIR to ${MYSQL_USER}:${MYSQL_GROUP} 700 - fix safe_mysqld to send all output to the error log and to NOT output random messages to the tty it was started on. - display a MESSAGE reminding people to change the password of the mysql 'root' user. - bump PKGREVISION (to 3.23.49nb2) @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- scripts/safe_mysqld.sh.orig Tue Jan 21 16:11:16 2003 +++ scripts/safe_mysqld.sh @@@@ -184,6 +184,14 @@@@ then d20 1 a20 1 @@@@ -194,18 +202,16 @@@@ then d43 1 a43 1 @@@@ -214,11 +220,11 @@@@ fi d57 1 a57 1 @@@@ -226,7 +232,7 @@@@ echo "Starting $MYSQLD daemon with datab d66 1 a66 1 @@@@ -249,7 +255,7 @@@@ do d75 1 a75 1 @@@@ -261,7 +267,7 @@@@ do a83 11 @@@@ -269,8 +275,7 @@@@ do 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" @ 1.2 log @Update MySQL to 3.22.27. There are a bunch of bug fixes to the server. For a complete list see the documentation. Also, get rid of USE_GMAKE. The normal make works just fine. Delete a whole bunch of patches that have been integrated into the distribution. Update the mit-pthreads patches to use _C_LABEL where appropriate so that mit-pthreads works on ELF and a.out for the affected platforms. @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.1 1999/05/06 23:37:01 tv Exp $ d3 5 a7 16 --- mit-pthreads/machdep/engine-alpha-netbsd-1.3.h.orig Mon Mar 9 11:30:59 1998 +++ mit-pthreads/machdep/engine-alpha-netbsd-1.3.h Thu Oct 22 18:24:17 1998 @@@@ -10,6 +10,7 @@@@ #include #include #include +#include /* for _NSIG */ /* The first machine dependent functions are the SEMAPHORES needing the test and set instruction. @@@@ -46,7 +47,7 @@@@ * sigset_t macros */ #define SIG_ANY(sig) (sig) -#define SIGMAX 31 +#define SIGMAX (_NSIG-1) d9 86 a94 2 /* * New Strutures @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.1 1998/10/28 18:18:08 bad Exp $ @ 1.1.1.1 log @Second half of the split mysql pkg (server). Works on alpha, arm32, i386, and sparc (more to come when this works properly with PTL2). @ text @@