cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to MySQL 3.23.54

Browse Source
This commit is contained in:
brad 2002-12-14 23:56:43 +00:00
parent 5fc0149b44
commit d320bc2c54
16 changed files with 95 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
databases/mysql/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.82 2002/11/15 23:37:55 brad Exp $
# $OpenBSD: Makefile,v 1.83 2002/12/14 23:56:43 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 (regression test suite)"
VERSION= 3.23.49
VERSION= 3.23.54
DISTNAME= mysql-${VERSION}
FULLPKGNAME= mysql-client-${VERSION}
PKGNAME-server= mysql-server-${VERSION}
@ -20,6 +20,7 @@ HOMEPAGE= http://www.mysql.com/
MAINTAINER= Brad Smith <brad@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -36,27 +37,24 @@ CXXFLAGS= ${CFLAGS} -felide-constructors -fno-exceptions -fno-rtti
USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/mit-pthreads/config
AUTOCONF_NEW= Yes
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static \
--localstatedir="${DB_DIR}" \
--with-innodb \
--with-comment='OpenBSD port: ${FULLPKGNAME-server}' \
--with-innodb \
--with-libwrap="/usr" \
--with-mysqld-user="mysql" \
--with-unix-socket-path="${SOCKET_DIR}/mysql.sock" \
--without-perl \
--without-debug \
--without-readline \
--without-bench \
--without-debug \
--without-docs \
--without-gemini \
--without-mit-threads \
--without-gemini
--without-perl \
--without-readline
CONFIGURE_ENV= HOSTNAME="/bin/hostname -s"
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \
${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh \
patch-*
FLAVORS= bdb
FLAVOR?=

6
databases/mysql/distinfo
View File

@ -1,3 +1,3 @@
MD5 (mysql-3.23.49.tar.gz) = 1eec75578df021ee22bb229268359d8f
RMD160 (mysql-3.23.49.tar.gz) = c72b545b1984789871c399937257d2ae6c932936
SHA1 (mysql-3.23.49.tar.gz) = 0256331c7aa9388955148f80cdca382f467ad1be
MD5 (mysql-3.23.54.tar.gz) = 03e1b9c2a76e4bff4f0ec68b62f3aaca
RMD160 (mysql-3.23.54.tar.gz) = 12398dee1eee30ce58f0b5d60886e06676474812
SHA1 (mysql-3.23.54.tar.gz) = ce681bed0314bed513002257862921886017fb20

62
databases/mysql/patches/patch-client_Makefile.in
View File

@ -1,62 +0,0 @@
$OpenBSD: patch-client_Makefile.in,v 1.4 2002/02/10 03:49:53 brad Exp $
--- client/Makefile.in.orig Thu Feb 7 16:13:15 2002
+++ client/Makefile.in Sat Feb 9 19:50:47 2002
@@ -359,47 +359,47 @@ maintainer-clean-libtool:
mysql: $(mysql_OBJECTS) $(mysql_DEPENDENCIES)
@rm -f mysql
- $(CXXLINK) $(mysql_LDFLAGS) $(mysql_OBJECTS) $(mysql_LDADD) $(LIBS)
+ $(CXXLINK) -rpath $(pkglibdir) $(mysql_LDFLAGS) $(mysql_OBJECTS) $(mysql_LDADD) $(LIBS)
mysqladmin: $(mysqladmin_OBJECTS) $(mysqladmin_DEPENDENCIES)
@rm -f mysqladmin
- $(LINK) $(mysqladmin_LDFLAGS) $(mysqladmin_OBJECTS) $(mysqladmin_LDADD) $(LIBS)
+ $(LINK) -rpath $(pkglibdir) $(mysqladmin_LDFLAGS) $(mysqladmin_OBJECTS) $(mysqladmin_LDADD) $(LIBS)
mysqlcheck: $(mysqlcheck_OBJECTS) $(mysqlcheck_DEPENDENCIES)
@rm -f mysqlcheck
- $(LINK) $(mysqlcheck_LDFLAGS) $(mysqlcheck_OBJECTS) $(mysqlcheck_LDADD) $(LIBS)
+ $(LINK) -rpath $(pkglibdir) $(mysqlcheck_LDFLAGS) $(mysqlcheck_OBJECTS) $(mysqlcheck_LDADD) $(LIBS)
mysqlshow: $(mysqlshow_OBJECTS) $(mysqlshow_DEPENDENCIES)
@rm -f mysqlshow
- $(LINK) $(mysqlshow_LDFLAGS) $(mysqlshow_OBJECTS) $(mysqlshow_LDADD) $(LIBS)
+ $(LINK) -rpath $(pkglibdir) $(mysqlshow_LDFLAGS) $(mysqlshow_OBJECTS) $(mysqlshow_LDADD) $(LIBS)
mysqldump: $(mysqldump_OBJECTS) $(mysqldump_DEPENDENCIES)
@rm -f mysqldump
- $(LINK) $(mysqldump_LDFLAGS) $(mysqldump_OBJECTS) $(mysqldump_LDADD) $(LIBS)
+ $(LINK) -rpath $(pkglibdir) $(mysqldump_LDFLAGS) $(mysqldump_OBJECTS) $(mysqldump_LDADD) $(LIBS)
mysqlimport: $(mysqlimport_OBJECTS) $(mysqlimport_DEPENDENCIES)
@rm -f mysqlimport
- $(LINK) $(mysqlimport_LDFLAGS) $(mysqlimport_OBJECTS) $(mysqlimport_LDADD) $(LIBS)
+ $(LINK) -rpath $(pkglibdir) $(mysqlimport_LDFLAGS) $(mysqlimport_OBJECTS) $(mysqlimport_LDADD) $(LIBS)
mysqltest: $(mysqltest_OBJECTS) $(mysqltest_DEPENDENCIES)
@rm -f mysqltest
- $(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)
+ $(LINK) -rpath $(pkglibdir) $(insert_test_LDFLAGS) $(insert_test_OBJECTS) $(insert_test_LDADD) $(LIBS)
select_test: $(select_test_OBJECTS) $(select_test_DEPENDENCIES)
@rm -f select_test
- $(LINK) $(select_test_LDFLAGS) $(select_test_OBJECTS) $(select_test_LDADD) $(LIBS)
+ $(LINK) -rpath $(pkglibdir) $(select_test_LDFLAGS) $(select_test_OBJECTS) $(select_test_LDADD) $(LIBS)
thread_test: $(thread_test_OBJECTS) $(thread_test_DEPENDENCIES)
@rm -f thread_test
- $(LINK) $(thread_test_LDFLAGS) $(thread_test_OBJECTS) $(thread_test_LDADD) $(LIBS)
+ $(LINK) -rpath $(pkglibdir) $(thread_test_LDFLAGS) $(thread_test_OBJECTS) $(thread_test_LDADD) $(LIBS)
.cc.o:
$(CXXCOMPILE) -c $<
.cc.lo:

13
databases/mysql/patches/patch-config_h_in
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-config_h_in,v 1.1 2002/07/11 15:42:17 brad Exp $
--- config.h.in.orig Thu Jul 11 10:36:08 2002
+++ config.h.in Thu Jul 11 10:37:12 2002
@@ -86,6 +86,9 @@
/* Version of .frm files */
#undef DOT_FRM_VERSION
+/* If LOAD DATA LOCAL INFILE should be enabled by default */
+#undef ENABLED_LOCAL_INFILE
+
/* READLINE: */
#undef FIONREAD_IN_SYS_IOCTL

50
databases/mysql/patches/patch-configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.2 2002/08/22 13:44:17 brad Exp $
--- configure.in.orig Thu Feb 14 12:30:15 2002
+++ configure.in Sat Aug 17 18:46:39 2002
@@ -365,38 +365,7 @@ AC_SUBST(PERL5)
$OpenBSD: patch-configure_in,v 1.3 2002/12/14 23:56:43 brad Exp $
--- configure.in.orig Thu Dec 5 04:37:05 2002
+++ configure.in Fri Dec 13 22:37:51 2002
@@ -392,38 +392,7 @@ AC_SUBST(PERL5)
AC_PATH_PROG(PS, ps, ps)
AC_MSG_CHECKING("how to check if pid exists")
PS=$ac_cv_path_PS
@ -41,36 +41,9 @@ $OpenBSD: patch-configure_in,v 1.2 2002/08/22 13:44:17 brad Exp $
AC_SUBST(FIND_PROC)
AC_MSG_RESULT("$FIND_PROC")
@@ -583,14 +552,23 @@ AC_ARG_WITH(mysqld-user,
)
AC_SUBST(MYSQLD_USER)
-# compile with strings functions in assembler
+# If we should allow LOAD DATA LOCAL
+AC_MSG_CHECKING(if we should enable LOAD DATA LOCAL by default)
AC_ARG_ENABLE(local-infile,
[ --enable-local-infile
- If LOAD DATA LOCAL INFILE is enabled by default.],
- [ ENABLED_LOCAL_INFILE=$enablewal ],
+ Enable LOAD DATA LOCAL INFILE (default: disabled)],
+ [ ENABLED_LOCAL_INFILE=$enableval ],
[ ENABLED_LOCAL_INFILE=no ]
)
+if test "$ENABLED_LOCAL_INFILE" = "yes"
+then
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([ENABLED_LOCAL_INFILE])
+else
+ AC_MSG_RESULT([no])
+fi
+
# Use Paul Eggerts macros from GNU tar to check for large file support.
MYSQL_SYS_LARGEFILE
@@ -655,7 +633,8 @@ AC_ARG_WITH(libwrap,
@@ -740,7 +709,8 @@ AC_ARG_WITH(libwrap,
AC_CHECK_HEADER(tcpd.h,
LIBS="$LIBS -lwrap"
LIBS="-lwrap $LIBS"
AC_MSG_CHECKING(for TCP wrappers library -lwrap)
- AC_TRY_LINK([#include <tcpd.h>
+ AC_TRY_LINK([#include <stdio.h>
@ -78,7 +51,7 @@ $OpenBSD: patch-configure_in,v 1.2 2002/08/22 13:44:17 brad Exp $
int allow_severity = 0;
int deny_severity = 0;
@@ -840,6 +819,10 @@ case $SYSTEM_TYPE in
@@ -940,6 +910,10 @@ case $SYSTEM_TYPE in
CXXFLAGS="$CXXFLAGS -Dunix"
OVERRIDE_MT_LD_ADD="\$(top_srcdir)/mit-pthreads/obj/libpthread.a"
;;
@ -89,7 +62,7 @@ $OpenBSD: patch-configure_in,v 1.2 2002/08/22 13:44:17 brad Exp $
*bsdi*)
echo "Adding fix for BSDI"
CFLAGS="$CFLAGS -D__BSD__ -DHAVE_BROKEN_REALPATH"
@@ -1205,7 +1188,7 @@ then
@@ -1309,7 +1283,7 @@ then
AC_CHECK_LIB(c_r,strtok_r)
case "$with_osf32_threads---$target_os" in
# Don't keep -lc_r in LIBS; -pthread handles it magically
@ -98,10 +71,11 @@ $OpenBSD: patch-configure_in,v 1.2 2002/08/22 13:44:17 brad Exp $
esac
AC_CHECK_FUNCS(strtok_r pthread_init)
else
@@ -1227,28 +1210,6 @@ AC_SUBST(LIBDL)
@@ -1330,29 +1304,6 @@ AC_SUBST(LIBDL)
# System characteristics
AC_SYS_RESTARTABLE_SYSCALLS
-
-# Build optimized or debug version ?
-# First check for gcc and g++
-if test "$ac_cv_prog_gcc" = "yes"
@ -124,6 +98,6 @@ $OpenBSD: patch-configure_in,v 1.2 2002/08/22 13:44:17 brad Exp $
- DEBUG_OPTIMIZE_CXX=""
- OPTIMIZE_CXXFLAGS="-O"
-fi
AC_ARG_WITH(debug,
[ --without-debug Build a production version without debugging code],
[with_debug=$withval],

10
databases/mysql/patches/patch-innobase_include_univ_i
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-innobase_include_univ_i,v 1.1 2002/03/19 03:22:40 espie Exp $
--- innobase/include/univ.i.orig Tue Mar 19 03:53:11 2002
+++ innobase/include/univ.i Tue Mar 19 03:53:43 2002
@@ -104,12 +104,8 @@ memory is read outside the allocated blo
$OpenBSD: patch-innobase_include_univ_i,v 1.2 2002/12/14 23:56:43 brad Exp $
--- innobase/include/univ.i.orig Thu Oct 10 06:17:25 2002
+++ innobase/include/univ.i Tue Nov 26 21:18:01 2002
@@ -118,12 +118,8 @@ memory is read outside the allocated blo
#define UNIV_INLINE __inline
#else
/* config.h contains the right def for 'inline' for the current compiler */
@ -10,7 +10,7 @@ $OpenBSD: patch-innobase_include_univ_i,v 1.1 2002/03/19 03:22:40 espie Exp $
-#else
-/* extern inline doesn't work with gcc 3.0.2 */
+/* mysql people don't understand extern inline */
#define UNIV_INLINE static inline
#define UNIV_INLINE static inline
-#endif
#endif

12
databases/mysql/patches/patch-libmysql_libmysql_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libmysql_libmysql_c,v 1.1 2002/03/27 18:49:09 brad Exp $
--- libmysql/libmysql.c.orig Thu Feb 14 12:30:17 2002
+++ libmysql/libmysql.c Wed Mar 27 09:48:19 2002
@@ -712,7 +712,7 @@ static void mysql_read_default_options(s
*end=0; /* Remove '=' */
}
/* Change all '_' in variable name to '-' */
- for (end= *option ; (end= strcend(end,'_')) ; )
+ for (end= *option ; (end= strcend(end,'_')) && *end; )
*end= '-';
switch (find_type(*option+2,&option_types,2)) {
case 1: /* port */

12
databases/mysql/patches/patch-libmysql_r_libmysql_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libmysql_r_libmysql_c,v 1.1 2002/03/27 18:49:09 brad Exp $
--- libmysql_r/libmysql.c.orig Thu Feb 14 12:30:17 2002
+++ libmysql_r/libmysql.c Wed Mar 27 09:49:18 2002
@@ -712,7 +712,7 @@ static void mysql_read_default_options(s
*end=0; /* Remove '=' */
}
/* Change all '_' in variable name to '-' */
- for (end= *option ; (end= strcend(end,'_')) ; )
+ for (end= *option ; (end= strcend(end,'_')) && *end; )
*end= '-';
switch (find_type(*option+2,&option_types,2)) {
case 1: /* port */

8
databases/mysql/patches/patch-mysql-test_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mysql-test_Makefile_in,v 1.3 2002/02/10 03:49:53 brad Exp $
--- mysql-test/Makefile.in.orig Thu Feb 7 16:14:08 2002
+++ mysql-test/Makefile.in Sat Feb 9 19:50:48 2002
@@ -178,7 +178,7 @@ sql_server_dirs = @sql_server_dirs@
$OpenBSD: patch-mysql-test_Makefile_in,v 1.4 2002/12/14 23:56:43 brad Exp $
--- mysql-test/Makefile.in.orig Thu Dec 5 04:37:23 2002
+++ mysql-test/Makefile.in Fri Dec 13 22:37:51 2002
@@ -188,7 +188,7 @@ sql_server_dirs = @sql_server_dirs@
thread_dirs = @thread_dirs@
uname_prog = @uname_prog@

8
databases/mysql/patches/patch-scripts_Makefile.in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-scripts_Makefile.in,v 1.8 2002/02/10 03:49:53 brad Exp $
--- scripts/Makefile.in.orig Thu Feb 7 16:14:02 2002
+++ scripts/Makefile.in Sat Feb 9 19:50:48 2002
@@ -355,6 +355,7 @@ mysqlbug: ${top_builddir}/config.status
$OpenBSD: patch-scripts_Makefile.in,v 1.9 2002/12/14 23:56:43 brad Exp $
--- scripts/Makefile.in.orig Thu Dec 5 04:37:24 2002
+++ scripts/Makefile.in Fri Dec 13 22:37:51 2002
@@ -432,6 +432,7 @@ mysqlbug: ${top_builddir}/config.status
-e 's!@''datadir''@!$(datadir)!g' \
-e 's!@''localstatedir''@!$(localstatedir)!g' \
-e 's!@''libexecdir''@!$(libexecdir)!g' \

8
databases/mysql/patches/patch-scripts_mysql_install_db.sh
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_mysql_install_db.sh,v 1.8 2002/03/19 19:11:39 brad Exp $
--- scripts/mysql_install_db.sh.orig Thu Feb 14 12:30:26 2002
+++ scripts/mysql_install_db.sh Sat Mar 2 01:23:08 2002
$OpenBSD: patch-scripts_mysql_install_db.sh,v 1.9 2002/12/14 23:56:43 brad Exp $
--- scripts/mysql_install_db.sh.orig Thu Oct 10 06:17:34 2002
+++ scripts/mysql_install_db.sh Tue Nov 26 21:07:21 2002
@@ -7,12 +7,9 @@
#
# All unrecognized arguments to this script are passed to mysqld.
@ -121,7 +121,7 @@ $OpenBSD: patch-scripts_mysql_install_db.sh,v 1.8 2002/03/19 19:11:39 brad Exp $
- fi
echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
echo "This is done with:"
echo "$bindir/mysqladmin -u root -p password 'new-password'"
echo "$bindir/mysqladmin -u root password 'new-password'"
@@ -330,15 +304,6 @@ then
echo "able to use the new GRANT command!"
fi

26
databases/mysql/patches/patch-scripts_safe_mysqld.sh
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_safe_mysqld.sh,v 1.7 2002/03/19 19:11:39 brad Exp $
--- scripts/safe_mysqld.sh.orig Thu Feb 14 12:30:15 2002
+++ scripts/safe_mysqld.sh Tue Mar 19 13:01:45 2002
$OpenBSD: patch-scripts_safe_mysqld.sh,v 1.8 2002/12/14 23:56:43 brad Exp $
--- scripts/safe_mysqld.sh.orig Thu Dec 5 04:37:05 2002
+++ scripts/safe_mysqld.sh Sat Dec 14 04:13:07 2002
@@ -68,34 +68,16 @@ parse_arguments() {
done
}
@ -43,7 +43,19 @@ $OpenBSD: patch-scripts_safe_mysqld.sh,v 1.7 2002/03/19 19:11:39 brad Exp $
# Use the mysqld-max binary by default if the user doesn't specify a binary
if test -x $ledir/mysqld-max
@@ -221,10 +203,17 @@ fi
@@ -159,9 +141,9 @@ then
NOHUP_NICENESS=`nohup nice 2>&1`
if test $? -eq 0 && test x"$NOHUP_NICENESS" != x0 && nice --1 echo foo > /dev/null 2>&1
then
- if $NOHUP_NICENESS -gt 0
+ if test $NOHUP_NICENESS -gt 0
then
- $NOHUP_NICENESS="nice --$NOHUP_NICENESS nohup"
+ NOHUP_NICENESS="nice --$NOHUP_NICENESS nohup"
else
NOHUP_NICENESS="nice -$NOHUP_NICENESS nohup"
fi
@@ -226,10 +208,17 @@ fi
echo "Starting $MYSQLD daemon with databases from $DATADIR"
# Does this work on all systems?
@ -65,7 +77,7 @@ $OpenBSD: patch-scripts_safe_mysqld.sh,v 1.7 2002/03/19 19:11:39 brad Exp $
echo "`date +'%y%m%d %H:%M:%S mysqld started'`" >> $err_log
while true
@@ -239,34 +228,6 @@ do
@@ -244,34 +233,6 @@ do
if test ! -f $pid_file # This is removed if normal shutdown
then
break
@ -83,7 +95,7 @@ $OpenBSD: patch-scripts_safe_mysqld.sh,v 1.7 2002/03/19 19:11:39 brad Exp $
- I=1
- while test "$I" -le "$numofproces"
- do
- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | tail -1`
- PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | sed -n '$p'`
- for T in $PROC
- do
- break
@ -99,4 +111,4 @@ $OpenBSD: patch-scripts_safe_mysqld.sh,v 1.7 2002/03/19 19:11:39 brad Exp $
- done
fi
echo "`date +'%y%m%d %H:%M:%S mysqld restarted'`" | tee -a $err_log
echo "`date +'%y%m%d %H:%M:%S'` mysqld restarted" | tee -a $err_log

8
databases/mysql/patches/patch-sql_Makefile.in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sql_Makefile.in,v 1.14 2002/02/10 03:49:53 brad Exp $
--- sql/Makefile.in.orig Thu Feb 7 16:13:59 2002
+++ sql/Makefile.in Sat Feb 9 19:50:49 2002
@@ -1861,8 +1861,7 @@ sql_yacc.h: sql_yacc.yy
$OpenBSD: patch-sql_Makefile.in,v 1.15 2002/12/14 23:56:43 brad Exp $
--- sql/Makefile.in.orig Thu Dec 5 04:37:24 2002
+++ sql/Makefile.in Fri Dec 13 22:37:51 2002
@@ -816,8 +816,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."

15
databases/mysql/patches/patch-sql_gen_lex_hash_cc
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-sql_gen_lex_hash_cc,v 1.3 2002/11/14 03:47:55 brad Exp $
--- sql/gen_lex_hash.cc.orig Thu Feb 14 12:30:22 2002
+++ sql/gen_lex_hash.cc Wed Nov 13 20:29:45 2002
@@ -481,7 +481,11 @@ int main(int argc,char **argv)
int error;
MY_INIT(argv[0]);
+#ifdef __sparc64__
+ start_value=5486496L; best_t1=8380233L; best_t2=4437980L; best_type=3; /* mode=7603 add=3 type: 0 */
+#else
start_value=6130115L; best_t1=3632784L; best_t2=86437L; best_type=3; /* mode=4229 add=2 type: 0 */
+#endif
if (get_options(argc,(char **) argv))
exit(1);

5
databases/mysql/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.20 2001/09/20 19:25:42 brad Exp $
@comment $OpenBSD: PLIST,v 1.21 2002/12/14 23:56:43 brad Exp $
bin/mysql
bin/mysqladmin
bin/mysqlbinlog
@ -28,9 +28,6 @@ include/mysql/sslopt-case.h
include/mysql/sslopt-longopts.h
include/mysql/sslopt-usage.h
include/mysql/sslopt-vars.h
@unexec install-info --delete --info-dir=%D/info %D/info/mysql.info
info/mysql.info
@exec install-info --info-dir=%D/info %D/info/mysql.info
lib/mysql/libmysqlclient.a
lib/mysql/libmysqlclient.la
%%SHARED%%

39
databases/mysql/pkg/PLIST-tests
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-tests,v 1.2 2001/12/29 17:56:56 brad Exp $
@comment $OpenBSD: PLIST-tests,v 1.3 2002/12/14 23:56:43 brad Exp $
share/mysql-test/README
share/mysql-test/include/have_bdb.inc
share/mysql-test/include/have_gemini.inc
@ -12,6 +12,8 @@ share/mysql-test/r/alter_table.result
share/mysql-test/r/analyse.result
share/mysql-test/r/auto_increment.result
share/mysql-test/r/backup.result
share/mysql-test/r/bdb-alter-table-1.result
share/mysql-test/r/bdb-alter-table-2.result
share/mysql-test/r/bdb-crash.result
share/mysql-test/r/bdb-deadlock.result
share/mysql-test/r/bdb.result
@ -37,11 +39,14 @@ share/mysql-test/r/fulltext_left_join.result
share/mysql-test/r/fulltext_multi.result
share/mysql-test/r/fulltext_order_by.result
share/mysql-test/r/fulltext_update.result
share/mysql-test/r/func_concat.result
share/mysql-test/r/func_crypt.result
share/mysql-test/r/func_date_add.result
share/mysql-test/r/func_equal.result
share/mysql-test/r/func_group.result
share/mysql-test/r/func_if.result
share/mysql-test/r/func_in.result
share/mysql-test/r/func_isnull.result
share/mysql-test/r/func_like.result
share/mysql-test/r/func_math.result
share/mysql-test/r/func_misc.result
@ -56,9 +61,13 @@ share/mysql-test/r/func_timestamp.result
share/mysql-test/r/gcc296.result
share/mysql-test/r/gemini.result
share/mysql-test/r/group_by.result
share/mysql-test/r/have_bdb.require
share/mysql-test/r/have_gemini.require
share/mysql-test/r/have_innodb.require
share/mysql-test/r/have_isam.require
share/mysql-test/r/have_raid.require
share/mysql-test/r/having.result
share/mysql-test/r/heap.result
share/mysql-test/r/identity.result
share/mysql-test/r/innodb.result
share/mysql-test/r/ins000001.result
share/mysql-test/r/insert.result
@ -105,11 +114,13 @@ share/mysql-test/r/rpl000012.result
share/mysql-test/r/rpl000013.result
share/mysql-test/r/rpl000014.result
share/mysql-test/r/rpl000015.result
share/mysql-test/r/rpl000016.result
share/mysql-test/r/rpl000017.result
share/mysql-test/r/rpl000018.result
share/mysql-test/r/rpl_alter.result
share/mysql-test/r/rpl_empty_master_crash.result
share/mysql-test/r/rpl_get_lock.result
share/mysql-test/r/rpl_mystery22.result
share/mysql-test/r/rpl_rotate_logs.result
share/mysql-test/r/rpl_skip_error.result
share/mysql-test/r/rpl_sporadic_master.result
share/mysql-test/r/sel000001.result
@ -135,6 +146,7 @@ share/mysql-test/r/type_decimal.result
share/mysql-test/r/type_enum.result
share/mysql-test/r/type_float.result
share/mysql-test/r/type_ranges.result
share/mysql-test/r/type_set.result
share/mysql-test/r/type_time.result
share/mysql-test/r/type_timestamp.result
share/mysql-test/r/type_uint.result
@ -150,6 +162,8 @@ share/mysql-test/t/alter_table.test
share/mysql-test/t/analyse.test
share/mysql-test/t/auto_increment.test
share/mysql-test/t/backup.test
share/mysql-test/t/bdb-alter-table-1.test
share/mysql-test/t/bdb-alter-table-2.test
share/mysql-test/t/bdb-crash.test
share/mysql-test/t/bdb-deadlock.test
share/mysql-test/t/bdb.test
@ -179,11 +193,14 @@ share/mysql-test/t/fulltext_left_join.test
share/mysql-test/t/fulltext_multi.test
share/mysql-test/t/fulltext_order_by.test
share/mysql-test/t/fulltext_update.test
share/mysql-test/t/func_concat.test
share/mysql-test/t/func_crypt.test
share/mysql-test/t/func_date_add.test
share/mysql-test/t/func_equal.test
share/mysql-test/t/func_group.test
share/mysql-test/t/func_if.test
share/mysql-test/t/func_in.test
share/mysql-test/t/func_isnull.test
share/mysql-test/t/func_like.test
share/mysql-test/t/func_math.test
share/mysql-test/t/func_misc.test
@ -200,7 +217,6 @@ share/mysql-test/t/gemini.test
share/mysql-test/t/group_by.test
share/mysql-test/t/having.test
share/mysql-test/t/heap.test
share/mysql-test/t/identity.test
share/mysql-test/t/innodb.test
share/mysql-test/t/ins000001.test
share/mysql-test/t/insert.test
@ -251,16 +267,18 @@ share/mysql-test/t/rpl000013.test
share/mysql-test/t/rpl000014.test
share/mysql-test/t/rpl000015-slave-master-info.opt
share/mysql-test/t/rpl000015.test
share/mysql-test/t/rpl000016-master.opt
share/mysql-test/t/rpl000016-slave-master-info.opt
share/mysql-test/t/rpl000016.test
share/mysql-test/t/rpl000017-slave.opt
share/mysql-test/t/rpl000017.test
share/mysql-test/t/rpl000018-master.opt
share/mysql-test/t/rpl000018-slave.opt
share/mysql-test/t/rpl000018.test
share/mysql-test/t/rpl_alter.test
share/mysql-test/t/rpl_empty_master_crash.test
share/mysql-test/t/rpl_get_lock.test
share/mysql-test/t/rpl_mystery22.test
share/mysql-test/t/rpl_rotate_logs-master.opt
share/mysql-test/t/rpl_rotate_logs-slave-master-info.opt
share/mysql-test/t/rpl_rotate_logs.test
share/mysql-test/t/rpl_skip_error-slave.opt
share/mysql-test/t/rpl_skip_error.test
share/mysql-test/t/rpl_sporadic_master-master.opt
@ -286,6 +304,7 @@ share/mysql-test/t/type_decimal.test
share/mysql-test/t/type_enum.test
share/mysql-test/t/type_float.test
share/mysql-test/t/type_ranges.test
share/mysql-test/t/type_set.test
share/mysql-test/t/type_time.test
share/mysql-test/t/type_timestamp.test
share/mysql-test/t/type_uint.test
@ -295,8 +314,8 @@ share/mysql-test/t/user_var.test
share/mysql-test/t/varbinary.test
share/mysql-test/t/variables.test
share/mysql-test/t/warnings.test
@dirrm share/mysql-test/include
@dirrm share/mysql-test/r
@dirrm share/mysql-test/std_data
@dirrm share/mysql-test/t
@dirrm share/mysql-test/std_data
@dirrm share/mysql-test/r
@dirrm share/mysql-test/include
@dirrm share/mysql-test