From 027ccc4cbb16decf92d06dd1c7ca1b0fec1ada0f Mon Sep 17 00:00:00 2001 From: brad Date: Mon, 10 Sep 2001 02:59:35 +0000 Subject: [PATCH] upgrade to MySQL 3.23.42 --- databases/mysql/Makefile | 4 +- databases/mysql/files/md5 | 6 +-- .../mysql/patches/patch-client_Makefile.in | 13 +++-- databases/mysql/patches/patch-configure | 24 ++++----- .../mysql/patches/patch-include_m_ctype_h | 49 +++++++++++++++++++ databases/mysql/patches/patch-ltconfig | 12 ++--- .../patches/patch-scripts_safe_mysqld.sh | 10 ++-- databases/mysql/patches/patch-sql_Makefile.in | 8 +-- 8 files changed, 90 insertions(+), 36 deletions(-) create mode 100644 databases/mysql/patches/patch-include_m_ctype_h diff --git a/databases/mysql/Makefile b/databases/mysql/Makefile index e3ed2c7b3cd..2b81d7cf808 100644 --- a/databases/mysql/Makefile +++ b/databases/mysql/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.54 2001/08/30 02:10:40 brad Exp $ +# $OpenBSD: Makefile,v 1.55 2001/09/10 02:59:35 brad Exp $ # $FreeBSD: Makefile,v 1.44 1999/03/04 21:27:58 dirk Exp $ # Uses pthreads @@ -6,7 +6,7 @@ COMMENT= "multithreaded SQL database (client)" COMMENT-server= "multithreaded SQL database (server)" COMMENT-tests= "multithreaded SQL database (test suite)" -VERSION= 3.23.41 +VERSION= 3.23.42 DISTNAME= mysql-${VERSION} FULLPKGNAME= mysql-client-${VERSION} PKGNAME-server= mysql-server-${VERSION} diff --git a/databases/mysql/files/md5 b/databases/mysql/files/md5 index 80730daa446..697e0f6b873 100644 --- a/databases/mysql/files/md5 +++ b/databases/mysql/files/md5 @@ -1,3 +1,3 @@ -MD5 (mysql-3.23.41.tar.gz) = c3fd551d752b40d384a53febf7175d09 -RMD160 (mysql-3.23.41.tar.gz) = 9ff0b05d0090d236a250d40930f0539bd1d20d5e -SHA1 (mysql-3.23.41.tar.gz) = b79cd5ee4cf03148272bbe8eef53a5f44f2e1081 +MD5 (mysql-3.23.42.tar.gz) = 0e97b34070111e232c742a42d11c5844 +RMD160 (mysql-3.23.42.tar.gz) = 8739eef8a5be46142272ab9bb9482fabb56cd638 +SHA1 (mysql-3.23.42.tar.gz) = d171d7f910d00fe535a8acc2fa599b12e14bf9cb diff --git a/databases/mysql/patches/patch-client_Makefile.in b/databases/mysql/patches/patch-client_Makefile.in index cb58e0b0515..9a12728c7b7 100644 --- a/databases/mysql/patches/patch-client_Makefile.in +++ b/databases/mysql/patches/patch-client_Makefile.in @@ -1,7 +1,7 @@ -$OpenBSD: patch-client_Makefile.in,v 1.1 2001/06/02 20:18:44 brad Exp $ ---- client/Makefile.in.orig Wed May 9 16:43:24 2001 -+++ client/Makefile.in Sat Jun 2 01:19:07 2001 -@@ -348,43 +348,43 @@ maintainer-clean-libtool: +$OpenBSD: patch-client_Makefile.in,v 1.2 2001/09/10 02:59:35 brad Exp $ +--- client/Makefile.in.orig Sat Sep 8 15:17:03 2001 ++++ client/Makefile.in Sun Sep 9 20:07:11 2001 +@@ -355,47 +355,47 @@ maintainer-clean-libtool: mysql: $(mysql_OBJECTS) $(mysql_DEPENDENCIES) @rm -f mysql @@ -38,6 +38,11 @@ $OpenBSD: patch-client_Makefile.in,v 1.1 2001/06/02 20:18:44 brad Exp $ - $(LINK) $(mysqltest_LDFLAGS) $(mysqltest_OBJECTS) $(mysqltest_LDADD) $(LIBS) + $(LINK) -rpath $(pkglibdir) $(mysqltest_LDFLAGS) $(mysqltest_OBJECTS) $(mysqltest_LDADD) $(LIBS) + mysqlbinlog: $(mysqlbinlog_OBJECTS) $(mysqlbinlog_DEPENDENCIES) + @rm -f mysqlbinlog +- $(CXXLINK) $(mysqlbinlog_LDFLAGS) $(mysqlbinlog_OBJECTS) $(mysqlbinlog_LDADD) $(LIBS) ++ $(CXXLINK) -rpath $(pkglibdir) $(mysqlbinlog_LDFLAGS) $(mysqlbinlog_OBJECTS) $(mysqlbinlog_LDADD) $(LIBS) + insert_test: $(insert_test_OBJECTS) $(insert_test_DEPENDENCIES) @rm -f insert_test - $(LINK) $(insert_test_LDFLAGS) $(insert_test_OBJECTS) $(insert_test_LDADD) $(LIBS) diff --git a/databases/mysql/patches/patch-configure b/databases/mysql/patches/patch-configure index 4495215be21..820623d6946 100644 --- a/databases/mysql/patches/patch-configure +++ b/databases/mysql/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.10 2001/08/14 02:06:29 brad Exp $ ---- configure.orig Sat Aug 11 07:12:34 2001 -+++ configure Mon Aug 13 19:48:54 2001 -@@ -2992,7 +2992,7 @@ else +$OpenBSD: patch-configure,v 1.11 2001/09/10 02:59:35 brad Exp $ +--- configure.orig Sat Sep 8 15:08:27 2001 ++++ configure Sun Sep 9 20:12:00 2001 +@@ -3000,7 +3000,7 @@ else ;; esac fi @@ -10,9 +10,9 @@ $OpenBSD: patch-configure,v 1.10 2001/08/14 02:06:29 brad Exp $ if test -n "$HOSTNAME"; then echo "$ac_t""$HOSTNAME" 1>&6 else -@@ -3126,38 +3126,7 @@ fi +@@ -3134,38 +3134,7 @@ fi echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6 - echo "configure:3128: checking "how to check if pid exists"" >&5 + echo "configure:3136: 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 @@ -50,23 +50,23 @@ $OpenBSD: patch-configure,v 1.10 2001/08/14 02:06:29 brad Exp $ echo "$ac_t"""$FIND_PROC"" 1>&6 -@@ -5015,6 +4984,7 @@ else +@@ -5023,6 +4992,7 @@ else cat > conftest.$ac_ext < #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -@@ -5040,6 +5010,7 @@ echo "configure:5040: checking for TCP w +@@ -5048,6 +5018,7 @@ echo "configure:5048: checking for TCP w cat > conftest.$ac_ext < #include int allow_severity = 0; int deny_severity = 0; -@@ -5934,8 +5905,6 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -5989,8 +5960,6 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l #define $ac_tr_lib 1 EOF @@ -75,7 +75,7 @@ $OpenBSD: patch-configure,v 1.10 2001/08/14 02:06:29 brad Exp $ else echo "$ac_t""no" 1>&6 fi -@@ -6165,29 +6134,6 @@ EOF +@@ -6220,29 +6189,6 @@ EOF fi diff --git a/databases/mysql/patches/patch-include_m_ctype_h b/databases/mysql/patches/patch-include_m_ctype_h new file mode 100644 index 00000000000..8e02249d40a --- /dev/null +++ b/databases/mysql/patches/patch-include_m_ctype_h @@ -0,0 +1,49 @@ +$OpenBSD: patch-include_m_ctype_h,v 1.1 2001/09/10 02:59:35 brad Exp $ +--- include/m_ctype.h.orig Sat Sep 8 15:08:15 2001 ++++ include/m_ctype.h Sun Sep 9 20:12:00 2001 +@@ -71,6 +71,15 @@ extern CHARSET_INFO compiled_charsets[] + #define __CTYPE_INCLUDED + #define _CTYPE_USING /* Don't put names in global namespace. */ + ++#undef _U ++#undef _L ++#undef _N ++#undef _S ++#undef _P ++#undef _C ++#undef _B ++#undef _X ++ + #define _U 01 /* Upper case */ + #define _L 02 /* Lower case */ + #define _N 04 /* Numeral (digit) */ +@@ -86,11 +95,29 @@ extern CHARSET_INFO compiled_charsets[] + #define my_sort_order (default_charset_info->sort_order) + + #ifndef __WIN__ ++#undef _toupper + #define _toupper(c) (char) my_to_upper[(uchar) (c)] ++#undef _tolower + #define _tolower(c) (char) my_to_lower[(uchar) (c)] ++ ++#undef toupper ++#undef tolower + #define toupper(c) (char) my_to_upper[(uchar) (c)] + #define tolower(c) (char) my_to_lower[(uchar) (c)] + ++#undef isalpha ++#undef isupper ++#undef islower ++#undef isdigit ++#undef isxdigit ++#undef isalnum ++#undef isspace ++#undef ispunct ++#undef isprint ++#undef isgraph ++#undef iscntrl ++#undef isascii ++#undef toascii + #define isalpha(c) ((my_ctype+1)[(uchar) (c)] & (_U | _L)) + #define isupper(c) ((my_ctype+1)[(uchar) (c)] & _U) + #define islower(c) ((my_ctype+1)[(uchar) (c)] & _L) diff --git a/databases/mysql/patches/patch-ltconfig b/databases/mysql/patches/patch-ltconfig index a0bafefb25a..4e73d00015c 100644 --- a/databases/mysql/patches/patch-ltconfig +++ b/databases/mysql/patches/patch-ltconfig @@ -1,7 +1,7 @@ -$OpenBSD: patch-ltconfig,v 1.3 2001/06/02 20:18:44 brad Exp $ ---- ltconfig.orig Thu Feb 8 21:12:19 2001 -+++ ltconfig Tue Feb 20 14:03:16 2001 -@@ -1105,6 +1105,9 @@ cygwin* | mingw*) +$OpenBSD: patch-ltconfig,v 1.4 2001/09/10 02:59:35 brad Exp $ +--- ltconfig.orig Sat Sep 8 15:08:15 2001 ++++ ltconfig Sun Sep 9 20:12:00 2001 +@@ -1111,6 +1111,9 @@ cygwin* | mingw*) with_gnu_ld=no fi ;; @@ -11,7 +11,7 @@ $OpenBSD: patch-ltconfig,v 1.3 2001/06/02 20:18:44 brad Exp $ esac -@@ -1402,10 +1405,21 @@ else +@@ -1408,10 +1411,21 @@ else ;; openbsd*) @@ -35,7 +35,7 @@ $OpenBSD: patch-ltconfig,v 1.3 2001/06/02 20:18:44 brad Exp $ ;; os2*) -@@ -2022,13 +2036,10 @@ netbsd*) +@@ -2040,13 +2054,10 @@ netbsd*) openbsd*) version_type=sunos diff --git a/databases/mysql/patches/patch-scripts_safe_mysqld.sh b/databases/mysql/patches/patch-scripts_safe_mysqld.sh index 3776e36736d..ce3a49ec3e7 100644 --- a/databases/mysql/patches/patch-scripts_safe_mysqld.sh +++ b/databases/mysql/patches/patch-scripts_safe_mysqld.sh @@ -1,6 +1,6 @@ -$OpenBSD: patch-scripts_safe_mysqld.sh,v 1.5 2001/08/14 02:06:29 brad Exp $ ---- scripts/safe_mysqld.sh.orig Sat Aug 11 07:12:16 2001 -+++ scripts/safe_mysqld.sh Mon Aug 13 19:48:56 2001 +$OpenBSD: patch-scripts_safe_mysqld.sh,v 1.6 2001/09/10 02:59:35 brad Exp $ +--- scripts/safe_mysqld.sh.orig Sat Sep 8 15:08:13 2001 ++++ scripts/safe_mysqld.sh Sun Sep 9 20:12:02 2001 @@ -68,30 +68,9 @@ parse_arguments() { done } @@ -35,7 +35,7 @@ $OpenBSD: patch-scripts_safe_mysqld.sh,v 1.5 2001/08/14 02:06:29 brad Exp $ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -217,10 +196,10 @@ fi +@@ -221,10 +200,10 @@ fi echo "Starting $MYSQLD daemon with databases from $DATADIR" # Does this work on all systems? @@ -50,7 +50,7 @@ $OpenBSD: patch-scripts_safe_mysqld.sh,v 1.5 2001/08/14 02:06:29 brad Exp $ echo "`date +'%y%m%d %H:%M:%S mysqld started'`" >> $err_log while true -@@ -235,34 +214,6 @@ do +@@ -239,34 +218,6 @@ do if test ! -f $pid_file # This is removed if normal shutdown then break diff --git a/databases/mysql/patches/patch-sql_Makefile.in b/databases/mysql/patches/patch-sql_Makefile.in index 2812de0b03d..000b32b5415 100644 --- a/databases/mysql/patches/patch-sql_Makefile.in +++ b/databases/mysql/patches/patch-sql_Makefile.in @@ -1,7 +1,7 @@ -$OpenBSD: patch-sql_Makefile.in,v 1.10 2001/07/22 20:35:29 brad Exp $ ---- sql/Makefile.in.orig Wed Jul 18 17:29:19 2001 -+++ sql/Makefile.in Sat Jul 21 20:12:16 2001 -@@ -1895,8 +1895,7 @@ sql_yacc.h: sql_yacc.yy +$OpenBSD: patch-sql_Makefile.in,v 1.11 2001/09/10 02:59:35 brad Exp $ +--- sql/Makefile.in.orig Sat Sep 8 15:17:37 2001 ++++ sql/Makefile.in Sun Sep 9 20:12:02 2001 +@@ -1841,8 +1841,7 @@ sql_yacc.h: sql_yacc.yy sql_yacc.o: sql_yacc.cc sql_yacc.h @echo "Note: The following compile may take a long time."