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

upgrade to MySQL 5.0.21

Browse Source
This commit is contained in:
brad 2006-05-10 03:21:30 +00:00
parent e1c552749f
commit d5a5a6309f
10 changed files with 53 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/mysql/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.117 2006/04/30 20:55:44 brad Exp $
# $OpenBSD: Makefile,v 1.118 2006/05/10 03:21:30 brad Exp $
# Uses pthreads
.if ${MACHINE_ARCH} == "hppa" || ${MACHINE_ARCH} == "m88k"
@ -9,7 +9,7 @@ COMMENT= "multithreaded SQL database (client)"
COMMENT-server= "multithreaded SQL database (server)"
COMMENT-tests= "multithreaded SQL database (regression test suite)"
VERSION= 5.0.20a
VERSION= 5.0.21
DISTNAME= mysql-${VERSION}
FULLPKGNAME= mysql-client-${VERSION}
PKGNAME-server= mysql-server-${VERSION}

8
databases/mysql/distinfo
View File

@ -1,4 +1,4 @@
MD5 (mysql-5.0.20a.tar.gz) = 946867320094875c1a44f305bcdf1665
RMD160 (mysql-5.0.20a.tar.gz) = 87c3242de360155046ed24ee3d68cec720ec0b32
SHA1 (mysql-5.0.20a.tar.gz) = 497f1394156ed6787bd8f86c0602d9a0ba79a0a3
SIZE (mysql-5.0.20a.tar.gz) = 19459686
MD5 (mysql-5.0.21.tar.gz) = c3165204c42e1db6fc3a95a4fd2cd22f
RMD160 (mysql-5.0.21.tar.gz) = 4bbc85f2585c76c58ab09c74f144ee5bd701607e
SHA1 (mysql-5.0.21.tar.gz) = c249a237e7d84e08846df6f7becc277f4060219b
SIZE (mysql-5.0.21.tar.gz) = 19529703

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

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.16 2006/04/30 20:55:44 brad Exp $
--- configure.in.orig Fri Mar 31 12:10:39 2006
+++ configure.in Mon Apr 17 01:26:51 2006
$OpenBSD: patch-configure_in,v 1.17 2006/05/10 03:21:30 brad Exp $
--- configure.in.orig Wed Apr 26 14:31:03 2006
+++ configure.in Sun May 7 03:14:55 2006
@@ -445,44 +445,7 @@ AC_SUBST(MAKEINDEX)
AC_PATH_PROG(PS, ps, ps)
AC_MSG_CHECKING("how to check if pid exists")
@ -57,7 +57,7 @@ $OpenBSD: patch-configure_in,v 1.16 2006/04/30 20:55:44 brad Exp $
int allow_severity = 0;
int deny_severity = 0;
@@ -1538,7 +1502,7 @@ then
@@ -1543,7 +1507,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
@ -66,7 +66,7 @@ $OpenBSD: patch-configure_in,v 1.16 2006/04/30 20:55:44 brad Exp $
esac
AC_CHECK_FUNCS(strtok_r pthread_init)
@@ -1586,29 +1550,6 @@ case $SYSTEM_TYPE in
@@ -1591,29 +1555,6 @@ case $SYSTEM_TYPE in
AC_SYS_RESTARTABLE_SYSCALLS
;;
esac

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

@ -1,7 +1,7 @@
$OpenBSD: patch-innobase_Makefile_in,v 1.7 2006/01/06 00:13:26 brad Exp $
--- innobase/Makefile.in.orig Sat Aug 27 16:35:38 2005
+++ innobase/Makefile.in Sun Sep 4 19:12:41 2005
@@ -528,9 +528,9 @@ distcleancheck: distclean
$OpenBSD: patch-innobase_Makefile_in,v 1.8 2006/05/10 03:21:30 brad Exp $
--- innobase/Makefile.in.orig Wed Apr 26 14:33:12 2006
+++ innobase/Makefile.in Sun May 7 03:14:55 2006
@@ -548,9 +548,9 @@ distcleancheck: distclean
check-am: all-am
check: check-recursive
all-am: Makefile $(HEADERS) ib_config.h

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

@ -1,12 +1,12 @@
$OpenBSD: patch-mysql-test_Makefile_in,v 1.10 2006/03/10 23:51:53 brad Exp $
--- mysql-test/Makefile.in.orig Sat Mar 4 15:36:40 2006
+++ mysql-test/Makefile.in Tue Mar 7 22:21:00 2006
@@ -385,7 +385,7 @@ zlib_dir = @zlib_dir@
$OpenBSD: patch-mysql-test_Makefile_in,v 1.11 2006/05/10 03:21:30 brad Exp $
--- mysql-test/Makefile.in.orig Wed Apr 26 14:31:57 2006
+++ mysql-test/Makefile.in Sun May 7 03:14:55 2006
@@ -387,7 +387,7 @@ zlib_dir = @zlib_dir@
@HAVE_NDBCLUSTER_DB_TRUE@DIST_SUBDIRS = ndb
@HAVE_NDBCLUSTER_DB_FALSE@USE_NDBCLUSTER = \"\"
@HAVE_NDBCLUSTER_DB_TRUE@USE_NDBCLUSTER = \"--ndbcluster\"
-benchdir_root = $(prefix)
+benchdir_root = $(datadir)
testdir = $(benchdir_root)/mysql-test
EXTRA_SCRIPTS = mysql-test-run.sh mysql-test-run.pl install_test_db.sh valgrind.supp
EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)
EXTRA_DIST = $(EXTRA_SCRIPTS)

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

@ -1,7 +1,7 @@
$OpenBSD: patch-scripts_Makefile_in,v 1.3 2006/03/10 23:51:53 brad Exp $
--- scripts/Makefile.in.orig Sat Mar 4 15:36:58 2006
+++ scripts/Makefile.in Tue Mar 7 22:20:59 2006
@@ -643,6 +643,7 @@ mysqlbug: ${top_builddir}/config.status
$OpenBSD: patch-scripts_Makefile_in,v 1.4 2006/05/10 03:21:30 brad Exp $
--- scripts/Makefile.in.orig Wed Apr 26 14:32:21 2006
+++ scripts/Makefile.in Sun May 7 03:14:55 2006
@@ -650,6 +650,7 @@ mysqlbug: ${top_builddir}/config.status
-e 's!@''datadir''@!$(datadir)!g' \
-e 's!@''localstatedir''@!$(localstatedir)!g' \
-e 's!@''libexecdir''@!$(libexecdir)!g' \

30
databases/mysql/patches/patch-scripts_mysql_install_db_sh
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-scripts_mysql_install_db_sh,v 1.2 2005/10/07 22:46:47 brad Exp $
--- scripts/mysql_install_db.sh.orig Wed Aug 17 17:06:31 2005
+++ scripts/mysql_install_db.sh Fri Oct 7 15:01:18 2005
@@ -7,10 +7,9 @@
$OpenBSD: patch-scripts_mysql_install_db_sh,v 1.3 2006/05/10 03:21:30 brad Exp $
--- scripts/mysql_install_db.sh.orig Wed Apr 26 14:30:55 2006
+++ scripts/mysql_install_db.sh Sun May 7 03:16:59 2006
@@ -8,10 +8,9 @@
#
# All unrecognized arguments to this script are passed to mysqld.
@ -14,7 +14,7 @@ $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.2 2005/10/07 22:46:47 brad Exp $
case "$1" in
--no-defaults|--defaults-file=*|--defaults-extra-file=*)
@@ -31,7 +30,6 @@ parse_arguments() {
@@ -32,7 +31,6 @@ parse_arguments() {
for arg do
case "$arg" in
@ -22,7 +22,7 @@ $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.2 2005/10/07 22:46:47 brad Exp $
--basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
--ldata=*|--datadir=*) ldata=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
--user=*)
@@ -39,10 +37,9 @@ parse_arguments() {
@@ -40,10 +38,9 @@ parse_arguments() {
# as 'user' (crucial e.g. if log-bin=/some_other_path/
# where a chown of datadir won't help)
user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
@ -34,7 +34,7 @@ $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.2 2005/10/07 22:46:47 brad Exp $
*)
if test -n "$pick_args"
then
@@ -78,7 +75,6 @@ ldata=
@@ -79,7 +76,6 @@ ldata=
execdir=
bindir=
basedir=
@ -42,7 +42,7 @@ $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.2 2005/10/07 22:46:47 brad Exp $
verbose=0
fill_help_tables=""
@@ -127,44 +123,28 @@ mysqld=$execdir/mysqld
@@ -128,44 +124,28 @@ mysqld=$execdir/mysqld
mysqld_opt=""
scriptdir=$bindir
@ -96,7 +96,7 @@ $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.2 2005/10/07 22:46:47 brad Exp $
fi
echo "WARNING: The host '$hostname' could not be looked up with resolveip."
echo "This probably means that your libc libraries are not 100 % compatible"
@@ -172,7 +152,6 @@ then
@@ -173,7 +153,6 @@ then
echo "normally with the exception that host name resolving will not work."
echo "This means that you should use IP addresses instead of hostnames"
echo "when specifying MySQL privileges !"
@ -104,7 +104,7 @@ $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.2 2005/10/07 22:46:47 brad Exp $
fi
if test "$ip_only" = "1"
@@ -183,12 +162,10 @@ fi
@@ -184,12 +163,10 @@ fi
# Create database directories mysql & test
@ -121,7 +121,7 @@ $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.2 2005/10/07 22:46:47 brad Exp $
if test ! -f $mdata/db.frm
then
@@ -206,10 +183,7 @@ if test -n "$user"; then
@@ -207,10 +184,7 @@ if test -n "$user"; then
args="$args --user=$user"
fi
@ -133,7 +133,7 @@ $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.2 2005/10/07 22:46:47 brad Exp $
mysqld_install_cmd_line="$mysqld $defaults $mysqld_opt --bootstrap \
--skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb \
--skip-bdb --skip-ndbcluster $args --max_allowed_packet=8M --net_buffer_length=16K"
@@ -218,10 +192,7 @@ if $scriptdir/mysql_create_system_tables
@@ -219,10 +193,7 @@ if $scriptdir/mysql_create_system_tables
then
if test -n "$fill_help_tables"
then
@ -145,7 +145,7 @@ $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.2 2005/10/07 22:46:47 brad Exp $
(echo "use mysql;"; cat $fill_help_tables) | eval "$mysqld_install_cmd_line"
res=$?
if test $res != 0
@@ -232,15 +203,6 @@ then
@@ -233,15 +204,6 @@ then
echo ""
fi
fi
@ -161,7 +161,7 @@ $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.2 2005/10/07 22:46:47 brad Exp $
echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
echo "To do so, start the server, then issue the following commands:"
echo "$bindir/mysqladmin -u root password 'new-password'"
@@ -256,21 +218,11 @@ then
@@ -257,21 +219,11 @@ then
echo "able to use the new GRANT command!"
fi
echo
@ -178,7 +178,7 @@ $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.2 2005/10/07 22:46:47 brad Exp $
echo
echo "The latest information about MySQL is available on the web at"
echo "http://www.mysql.com"
echo "Support MySQL by buying support/licenses at https://order.mysql.com"
echo "Support MySQL by buying support/licenses at http://shop.mysql.com"
- fi
exit 0
else

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

@ -1,7 +1,7 @@
$OpenBSD: patch-sql_mysqld_cc,v 1.3 2006/04/30 20:55:44 brad Exp $
--- sql/mysqld.cc.orig Fri Mar 31 12:10:28 2006
+++ sql/mysqld.cc Mon Apr 17 01:25:24 2006
@@ -3338,7 +3338,7 @@ int main(int argc, char **argv)
$OpenBSD: patch-sql_mysqld_cc,v 1.4 2006/05/10 03:21:30 brad Exp $
--- sql/mysqld.cc.orig Wed Apr 26 14:30:47 2006
+++ sql/mysqld.cc Sun May 7 03:14:56 2006
@@ -3353,7 +3353,7 @@ int main(int argc, char **argv)
init_ssl();
#ifdef HAVE_LIBWRAP

3
databases/mysql/pkg/PLIST-server
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-server,v 1.20 2006/04/30 20:55:44 brad Exp $
@comment $OpenBSD: PLIST-server,v 1.21 2006/05/10 03:21:30 brad Exp $
@newgroup _mysql:502
@newuser _mysql:502:_mysql:daemon:MySQL Account:/nonexistent:/sbin/nologin
bin/comp_err
@ -40,6 +40,7 @@ lib/mysql/libvio.a
libexec/mysqld
libexec/mysqlmanager
@man man/man1/msql2mysql.1
@man man/man1/myisam_ftdump.1
@man man/man1/myisamchk.1
@man man/man1/myisamlog.1
@man man/man1/myisampack.1

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-tests,v 1.18 2006/04/30 20:55:44 brad Exp $
@comment $OpenBSD: PLIST-tests,v 1.19 2006/05/10 03:21:30 brad Exp $
share/mysql-test/
share/mysql-test/README
share/mysql-test/cacert.pem
@ -15,6 +15,7 @@ share/mysql-test/include/ctype_like_escape.inc
share/mysql-test/include/endspace.inc
share/mysql-test/include/federated.inc
share/mysql-test/include/federated_cleanup.inc
share/mysql-test/include/get_binlog_dump_thread_id.inc
share/mysql-test/include/gis_generic.inc
share/mysql-test/include/have_archive.inc
share/mysql-test/include/have_bdb.inc
@ -88,6 +89,7 @@ share/mysql-test/lib/mtr_report.pl
share/mysql-test/lib/mtr_stress.pl
share/mysql-test/lib/mtr_timer.pl
share/mysql-test/mysql-test-run
share/mysql-test/mysql-test-run.pl
share/mysql-test/r/
share/mysql-test/r/alias.result
share/mysql-test/r/alter_table.result
@ -287,6 +289,7 @@ share/mysql-test/r/innodb.result
share/mysql-test/r/innodb_cache.result
share/mysql-test/r/innodb_gis.result
share/mysql-test/r/innodb_handler.result
share/mysql-test/r/innodb_mysql.result
share/mysql-test/r/innodb_notembedded.result
share/mysql-test/r/innodb_unsafe_binlog.result
share/mysql-test/r/insert.result
@ -336,6 +339,7 @@ share/mysql-test/r/mysqldump.result
share/mysql-test/r/mysqlshow.result
share/mysql-test/r/mysqltest.result
share/mysql-test/r/ndb_alter_table.result
share/mysql-test/r/ndb_alter_table2.result
share/mysql-test/r/ndb_autodiscover.result
share/mysql-test/r/ndb_autodiscover2.result
share/mysql-test/r/ndb_basic.result
@ -518,7 +522,6 @@ share/mysql-test/r/sp-code.result
share/mysql-test/r/sp-destruct.result
share/mysql-test/r/sp-dynamic.result
share/mysql-test/r/sp-error.result
share/mysql-test/r/sp-goto.result
share/mysql-test/r/sp-prelocking.result
share/mysql-test/r/sp-security.result
share/mysql-test/r/sp-threads.result
@ -801,6 +804,7 @@ share/mysql-test/t/innodb_cache-master.opt
share/mysql-test/t/innodb_cache.test
share/mysql-test/t/innodb_gis.test
share/mysql-test/t/innodb_handler.test
share/mysql-test/t/innodb_mysql.test
share/mysql-test/t/innodb_notembedded.test
share/mysql-test/t/innodb_unsafe_binlog-master.opt
share/mysql-test/t/innodb_unsafe_binlog.test
@ -862,6 +866,7 @@ share/mysql-test/t/mysqldump.test
share/mysql-test/t/mysqlshow.test
share/mysql-test/t/mysqltest.test
share/mysql-test/t/ndb_alter_table.test
share/mysql-test/t/ndb_alter_table2.test
share/mysql-test/t/ndb_autodiscover.test
share/mysql-test/t/ndb_autodiscover2-master.opt
share/mysql-test/t/ndb_autodiscover2.test
@ -1081,6 +1086,7 @@ share/mysql-test/t/rpl_until.test
share/mysql-test/t/rpl_user_variables.test
share/mysql-test/t/rpl_variables-master.opt
share/mysql-test/t/rpl_variables.test
share/mysql-test/t/rpl_view-slave.opt
share/mysql-test/t/rpl_view.test
share/mysql-test/t/schema.test
share/mysql-test/t/select.test
@ -1096,7 +1102,6 @@ share/mysql-test/t/sp-code.test
share/mysql-test/t/sp-destruct.test
share/mysql-test/t/sp-dynamic.test
share/mysql-test/t/sp-error.test
share/mysql-test/t/sp-goto.test
share/mysql-test/t/sp-prelocking.test
share/mysql-test/t/sp-security.test
share/mysql-test/t/sp-threads.test