diff options
Diffstat (limited to 'databases/mysql4-server')
| -rw-r--r-- | databases/mysql4-server/Makefile | 3 | ||||
| -rw-r--r-- | databases/mysql4-server/distinfo | 14 | ||||
| -rw-r--r-- | databases/mysql4-server/patches/patch-aa | 19 | ||||
| -rw-r--r-- | databases/mysql4-server/patches/patch-am | 43 | ||||
| -rw-r--r-- | databases/mysql4-server/patches/patch-ar | 26 | ||||
| -rw-r--r-- | databases/mysql4-server/patches/patch-as | 11 |
6 files changed, 68 insertions, 48 deletions
diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile index 7d12b24dc16..143daf3ab8d 100644 --- a/databases/mysql4-server/Makefile +++ b/databases/mysql4-server/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2004/10/03 00:13:21 tv Exp $ +# $NetBSD: Makefile,v 1.11 2004/10/22 01:10:04 xtraeme Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} -PKGREVISION= 1 SVR4_PKGNAME= mysqs COMMENT= MySQL 4, a free SQL database (server) diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo index cfbfe7fcd0a..b4a671959ce 100644 --- a/databases/mysql4-server/distinfo +++ b/databases/mysql4-server/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.5 2004/06/20 18:48:44 xtraeme Exp $ +$NetBSD: distinfo,v 1.6 2004/10/22 01:10:04 xtraeme Exp $ -SHA1 (mysql-4.0.20.tar.gz) = e60d11b14ea97f3b95cd50e2c46cb664f729e3d8 -Size (mysql-4.0.20.tar.gz) = 13807983 bytes -SHA1 (patch-aa) = 3c10d0921336b5f7aea5033c3d4a33d3e11a894e +SHA1 (mysql-4.0.21.tar.gz) = 1f5059c79e0c3718e005d41c428b83f2755fc7aa +Size (mysql-4.0.21.tar.gz) = 14107388 bytes +SHA1 (patch-aa) = 8c47efec1c930fbb3ec655502b1434fc8e58fe40 SHA1 (patch-ae) = d5dcade3dea37c2f9be12bbddf6091ddb57344ac SHA1 (patch-af) = 038b5d570265e1f821de6502d05f94225eba5672 SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96 -SHA1 (patch-am) = 3c49714de59d5c51bd6f4c8634333d53d22b5ae0 +SHA1 (patch-am) = 691e8d492b96a4eec370d8413dcec28c7828c55b SHA1 (patch-aq) = 1e09f64374ebc3a9ee4cad2a8f6d7b11ba4b0451 -SHA1 (patch-ar) = 9b847ea353618d4133713999c8dff407b40a769e -SHA1 (patch-as) = c1f61c4f02d89fc5e89617a063f7ea1b0fa438d6 +SHA1 (patch-ar) = 7440bd5082194266652bd17a1a81b3778ab9b760 +SHA1 (patch-as) = 6e034bfe25d60efb852c39a08653510063fac866 SHA1 (patch-at) = 3a457c3f6b13312cb71b663108abd0ace09f2be4 SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91 SHA1 (patch-av) = 6ea5b9338d223f1380386288c537f55d4fd7a7d7 diff --git a/databases/mysql4-server/patches/patch-aa b/databases/mysql4-server/patches/patch-aa index 8392346114e..581c5c4905a 100644 --- a/databases/mysql4-server/patches/patch-aa +++ b/databases/mysql4-server/patches/patch-aa @@ -1,18 +1,19 @@ -$NetBSD: patch-aa,v 1.2 2004/03/07 19:42:55 martti Exp $ +$NetBSD: patch-aa,v 1.3 2004/10/22 01:10:04 xtraeme Exp $ ---- Makefile.in.orig Tue Feb 10 20:16:48 2004 -+++ Makefile.in Sun Mar 7 20:20:06 2004 -@@ -277,11 +277,8 @@ +--- Makefile.in.orig 2004-10-22 02:34:04.000000000 +0200 ++++ Makefile.in 2004-10-22 02:35:05.000000000 +0200 +@@ -279,12 +279,8 @@ # These are built from source in the Docs directory - EXTRA_DIST = INSTALL-SOURCE README COPYING + EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT -SUBDIRS = . include @docs_dirs@ @readline_dir@ \ - @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ scripts man tests \ -- BUILD @netware_dir@ os2 @libmysqld_dirs@ \ +- BUILD netware os2 @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ -+SUBDIRS = . include @thread_dirs@ pstack @sql_server_dirs@ \ -+ tests @bench_dirs@ support-files - +- ++SUBDIRS = . include @thread_dirs@ pstack @sql_server_dirs@ tests \ ++ @bench_dirs@ support-files # Relink after clean + linked_sources = linked_client_sources linked_server_sources \ diff --git a/databases/mysql4-server/patches/patch-am b/databases/mysql4-server/patches/patch-am index 6dc5fc9d07e..e9b5ecd87dc 100644 --- a/databases/mysql4-server/patches/patch-am +++ b/databases/mysql4-server/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.2 2004/03/07 19:42:55 martti Exp $ +$NetBSD: patch-am,v 1.3 2004/10/22 01:10:04 xtraeme Exp $ ---- scripts/mysqld_safe.sh.orig Sun Mar 7 20:19:31 2004 -+++ scripts/mysqld_safe.sh Sun Mar 7 20:20:59 2004 -@@ -257,6 +257,14 @@ +--- 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 +@@ -253,6 +253,14 @@ fi fi @@ -17,7 +17,7 @@ $NetBSD: patch-am,v 1.2 2004/03/07 19:42:55 martti Exp $ # # 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 -@@ -267,18 +275,16 @@ +@@ -263,18 +271,16 @@ then if @FIND_PROC@ then # The pid contains a mysqld process @@ -34,13 +34,13 @@ $NetBSD: patch-am,v 1.2 2004/03/07 19:42:55 martti Exp $ - 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" ++ 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 -@@ -291,11 +297,11 @@ +@@ -287,11 +293,11 @@ # Alternatively, you can start mysqld with the "myisam-recover" option. See # the manual for details. # @@ -54,7 +54,7 @@ $NetBSD: patch-am,v 1.2 2004/03/07 19:42:55 martti Exp $ # Does this work on all systems? #if type ulimit | grep "shell builtin" > /dev/null -@@ -303,7 +309,7 @@ +@@ -299,7 +305,7 @@ # ulimit -n 256 > /dev/null 2>&1 # Fix for BSD and FreeBSD systems #fi @@ -63,21 +63,30 @@ $NetBSD: patch-am,v 1.2 2004/03/07 19:42:55 martti Exp $ while true do rm -f $safe_mysql_unix_port $pid_file # Some extra safety -@@ -326,7 +332,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` +@@ -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 + +@@ -329,7 +335,7 @@ + numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD` + fi + - echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log -+ datemsg -e "\nNumber of processes running now: $numofproces" ++ datemsg -e "\nNumber of processes running now: $numofproces" I=1 while test "$I" -le "$numofproces" do -@@ -338,15 +344,14 @@ +@@ -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" ++ datemsg "$MYSQLD process hanging, pid $T - killed" else break fi diff --git a/databases/mysql4-server/patches/patch-ar b/databases/mysql4-server/patches/patch-ar index 4b1208d7cd5..42ba890e029 100644 --- a/databases/mysql4-server/patches/patch-ar +++ b/databases/mysql4-server/patches/patch-ar @@ -1,13 +1,23 @@ -$NetBSD: patch-ar,v 1.2 2004/03/07 19:42:55 martti Exp $ +$NetBSD: patch-ar,v 1.3 2004/10/22 01:10:04 xtraeme Exp $ ---- man/Makefile.in.orig Tue Feb 10 20:16:50 2004 -+++ man/Makefile.in Sun Mar 7 20:21:42 2004 -@@ -274,7 +274,7 @@ +--- man/Makefile.in.orig 2004-10-22 02:58:47.000000000 +0200 ++++ man/Makefile.in 2004-10-22 02:59:40.000000000 +0200 +@@ -274,16 +274,8 @@ + vio_dir = @vio_dir@ + vio_libs = @vio_libs@ - man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \ - mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ +-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 = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \ +- mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \ +- mysqldump.1.in mysqlshow.1.in perror.1.in replace.1.in mysqlman.1.in \ +- mysqld_safe.1.in mysql_fix_privilege_tables.1.in +- ++man_MANS = mysqld.1 mysqld_multi.1 ++EXTRA_DITS = mysqld.1.in mysqld_multi.1.in + CLEANFILES = $(man_MANS) - EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \ diff --git a/databases/mysql4-server/patches/patch-as b/databases/mysql4-server/patches/patch-as index 43de2ef0c2b..2beb0d1ff3c 100644 --- a/databases/mysql4-server/patches/patch-as +++ b/databases/mysql4-server/patches/patch-as @@ -1,8 +1,8 @@ -$NetBSD: patch-as,v 1.2 2004/03/07 19:42:55 martti Exp $ +$NetBSD: patch-as,v 1.3 2004/10/22 01:10:04 xtraeme Exp $ ---- support-files/Makefile.in.orig Tue Feb 10 20:16:54 2004 -+++ support-files/Makefile.in Sun Mar 7 20:22:01 2004 -@@ -286,15 +286,7 @@ +--- support-files/Makefile.in.orig 2004-10-22 02:39:03.000000000 +0200 ++++ support-files/Makefile.in 2004-10-22 02:39:24.000000000 +0200 +@@ -289,16 +289,7 @@ SUBDIRS = MacOSX @@ -10,12 +10,13 @@ $NetBSD: patch-as,v 1.2 2004/03/07 19:42:55 martti Exp $ - my-medium.cnf \ - my-large.cnf \ - my-huge.cnf \ +- my-innodb-heavy-4G.cnf \ - mysql-log-rotate \ - mysql-@VERSION@.spec \ - binary-configure \ - MySQL-shared-compat.spec - -+pkgdata_DATA = ++pkgdata_DATA = pkgdata_SCRIPTS = mysql.server |