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

Update to MySQL 5.0.37, from Frank Denis and Brad Smith

Browse Source 
ok $MAINTAINER, robert
This commit is contained in:
ckuethe 2007-04-09 22:43:06 +00:00
parent 447e642c0e
commit 1a4eb40557
11 changed files with 89 additions and 46 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.129 2007/01/25 07:41:48 jakob Exp $
# $OpenBSD: Makefile,v 1.130 2007/04/09 22:43:06 ckuethe Exp $
# Uses pthreads
.if ${MACHINE_ARCH} == "hppa" || ${MACHINE_ARCH} == "m88k"
@ -9,7 +9,7 @@ COMMENT-main= "multithreaded SQL database (client)"
COMMENT-server= "multithreaded SQL database (server)"
COMMENT-tests= "multithreaded SQL database (regression test suite)"
VERSION= 5.0.33
VERSION= 5.0.37
DISTNAME= mysql-${VERSION}
PKGNAME-main= mysql-client-${VERSION}
PKGNAME-server= mysql-server-${VERSION}

10
databases/mysql/distinfo
View File

@ -1,5 +1,5 @@
MD5 (mysql-5.0.33.tar.gz) = EMuFJ2oUaMeQak/03VZdYQ==
RMD160 (mysql-5.0.33.tar.gz) = 1OGVu6Xo7uQ74qqTXFngThoWb7U=
SHA1 (mysql-5.0.33.tar.gz) = eIk6o/L6dlDdATvTV7JtTuNiXAk=
SHA256 (mysql-5.0.33.tar.gz) = INizh0NvIlXBPqr8HJ4IwVue9k1BHUsE8Fw83AF3LaI=
SIZE (mysql-5.0.33.tar.gz) = 23045481
MD5 (mysql-5.0.37.tar.gz) = Ju12+stYverkDIMQ4zfd4g==
RMD160 (mysql-5.0.37.tar.gz) = Ey04hqgfzsm+UM3I2XyGiSj1Qk8=
SHA1 (mysql-5.0.37.tar.gz) = fJV9QzcVbH+YsGF/1aY/OoOKm8Q=
SHA256 (mysql-5.0.37.tar.gz) = mdQF3WiPmbg3nsE3MUOtJZ53vhTSJ3H4WwBY21Ayhcg=
SIZE (mysql-5.0.37.tar.gz) = 23239518

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.20 2007/01/25 07:41:48 jakob Exp $
--- configure.in.orig Tue Jan 9 07:51:08 2007
+++ configure.in Sun Jan 14 21:29:24 2007
@@ -457,44 +457,7 @@ AC_SUBST(ICHECK)
$OpenBSD: patch-configure_in,v 1.21 2007/04/09 22:43:06 ckuethe Exp $
--- configure.in.orig Mon Mar 5 20:21:13 2007
+++ configure.in Sat Mar 31 19:00:36 2007
@@ -465,44 +465,7 @@ AC_SUBST(ICHECK)
AC_PATH_PROG(PS, ps, ps)
AC_MSG_CHECKING("how to check if pid exists")
PS=$ac_cv_path_PS
@ -47,7 +47,7 @@ $OpenBSD: patch-configure_in,v 1.20 2007/01/25 07:41:48 jakob Exp $
AC_SUBST(FIND_PROC)
AC_MSG_RESULT("$FIND_PROC")
@@ -795,7 +758,8 @@ AC_ARG_WITH(libwrap,
@@ -833,7 +796,8 @@ AC_ARG_WITH(libwrap,
AC_CHECK_HEADER(tcpd.h,
LIBS="-lwrap $LIBS"
AC_MSG_CHECKING(for TCP wrappers library -lwrap)
@ -57,7 +57,7 @@ $OpenBSD: patch-configure_in,v 1.20 2007/01/25 07:41:48 jakob Exp $
int allow_severity = 0;
int deny_severity = 0;
@@ -1563,7 +1527,7 @@ then
@@ -1601,7 +1565,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.20 2007/01/25 07:41:48 jakob Exp $
esac
AC_CHECK_FUNCS(strtok_r pthread_init)
@@ -1611,29 +1575,6 @@ case $SYSTEM_TYPE in
@@ -1649,29 +1613,6 @@ case $SYSTEM_TYPE in
AC_SYS_RESTARTABLE_SYSCALLS
;;
esac

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

@ -1,7 +1,7 @@
$OpenBSD: patch-include_my_global_h,v 1.5 2006/03/10 23:51:53 brad Exp $
--- include/my_global.h.orig Sat Mar 4 15:34:48 2006
+++ include/my_global.h Tue Mar 7 22:18:47 2006
@@ -57,6 +57,10 @@
$OpenBSD: patch-include_my_global_h,v 1.6 2007/04/09 22:43:06 ckuethe Exp $
--- include/my_global.h.orig Mon Mar 5 20:21:41 2007
+++ include/my_global.h Sat Mar 31 19:00:41 2007
@@ -56,6 +56,10 @@
#define USE_PRAGMA_INTERFACE
#endif

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

@ -1,7 +1,7 @@
$OpenBSD: patch-innobase_Makefile_in,v 1.9 2006/10/14 05:04:54 brad Exp $
--- innobase/Makefile.in.orig Wed Oct 4 07:26:50 2006
+++ innobase/Makefile.in Thu Oct 12 05:18:57 2006
@@ -549,9 +549,9 @@ distcleancheck: distclean
$OpenBSD: patch-innobase_Makefile_in,v 1.10 2007/04/09 22:43:06 ckuethe Exp $
--- innobase/Makefile.in.orig Mon Mar 5 20:23:57 2007
+++ innobase/Makefile.in Sat Mar 31 19:00:47 2007
@@ -547,9 +547,9 @@ distcleancheck: distclean
check-am: all-am
check: check-recursive
all-am: Makefile $(HEADERS) ib_config.h

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

@ -1,7 +1,7 @@
$OpenBSD: patch-scripts_Makefile_in,v 1.6 2007/01/25 07:41:48 jakob Exp $
--- scripts/Makefile.in.orig Tue Jan 9 07:53:16 2007
+++ scripts/Makefile.in Sun Jan 14 21:29:24 2007
@@ -653,6 +653,7 @@ mysqlbug: ${top_builddir}/config.status
$OpenBSD: patch-scripts_Makefile_in,v 1.7 2007/04/09 22:43:06 ckuethe Exp $
--- scripts/Makefile.in.orig Mon Mar 5 20:23:19 2007
+++ scripts/Makefile.in Sat Mar 31 19:01:17 2007
@@ -655,6 +655,7 @@ mysqlbug: ${top_builddir}/config.status mysqlbug.sh
-e 's!@''datadir''@!$(datadir)!g' \
-e 's!@''localstatedir''@!$(localstatedir)!g' \
-e 's!@''libexecdir''@!$(libexecdir)!g' \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-scripts_mysql_install_db_sh,v 1.5 2007/01/25 07:41:48 jakob Exp $
--- scripts/mysql_install_db.sh.orig Tue Jan 9 07:51:08 2007
+++ scripts/mysql_install_db.sh Sun Jan 14 22:07:48 2007
@@ -10,7 +10,8 @@
$OpenBSD: patch-scripts_mysql_install_db_sh,v 1.6 2007/04/09 22:43:06 ckuethe Exp $
--- scripts/mysql_install_db.sh.orig Mon Mar 5 20:21:13 2007
+++ scripts/mysql_install_db.sh Sat Mar 31 19:01:27 2007
@@ -22,7 +22,8 @@
in_rpm=0
windows=0
defaults=""
@ -11,7 +11,7 @@ $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.5 2007/01/25 07:41:48 jakob Exp
case "$1" in
--no-defaults|--defaults-file=*|--defaults-extra-file=*)
@@ -40,6 +41,7 @@ parse_arguments() {
@@ -52,6 +53,7 @@ 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/^[^=]*=//'` ;;
@ -19,7 +19,7 @@ $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.5 2007/01/25 07:41:48 jakob Exp
--skip-name-resolve) ip_only=1 ;;
--verbose) verbose=1 ;;
--rpm) in_rpm=1 ;;
@@ -197,12 +199,10 @@ fi
@@ -209,12 +211,10 @@ fi
# Create database directories mysql & test
@ -36,7 +36,7 @@ $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.5 2007/01/25 07:41:48 jakob Exp
if test ! -f $mdata/db.frm
then
@@ -246,13 +246,6 @@ then
@@ -259,13 +259,6 @@ then
echo ""
fi
fi
@ -50,7 +50,7 @@ $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.5 2007/01/25 07:41:48 jakob Exp
if test "$windows" -eq 0
then
echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
@@ -270,15 +263,6 @@ then
@@ -283,15 +276,6 @@ then
echo "able to use the new GRANT command!"
fi
echo

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

@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_mysqld_safe_sh,v 1.11 2006/10/14 05:04:54 brad Exp $
--- scripts/mysqld_safe.sh.orig Wed Oct 4 07:24:11 2006
+++ scripts/mysqld_safe.sh Thu Oct 12 05:18:57 2006
$OpenBSD: patch-scripts_mysqld_safe_sh,v 1.12 2007/04/09 22:43:06 ckuethe Exp $
--- scripts/mysqld_safe.sh.orig Mon Mar 5 20:21:13 2007
+++ scripts/mysqld_safe.sh Sat Mar 31 19:02:39 2007
@@ -107,72 +107,12 @@ parse_arguments() {
}
@ -79,17 +79,18 @@ $OpenBSD: patch-scripts_mysqld_safe_sh,v 1.11 2006/10/14 05:04:54 brad Exp $
niceness=0
# these rely on $DATADIR by default, so we'll set them later on
@@ -210,7 +150,8 @@ mysql_unix_port_dir=`dirname $safe_mysql
@@ -210,8 +150,8 @@ mysql_unix_port_dir=`dirname $safe_mysql_unix_port`
if [ ! -d $mysql_unix_port_dir ]
then
mkdir $mysql_unix_port_dir
- chown $user $mysql_unix_port_dir
- chmod 755 $mysql_unix_port_dir
+ chown $user:$group $mysql_unix_port_dir
+ chmod 711 $mysql_unix_port_dir
fi
# Use the mysqld-max binary by default if the user doesn't specify a binary
@@ -370,12 +311,6 @@ fi
@@ -371,12 +311,6 @@ fi
echo "Starting $MYSQLD daemon with databases from $DATADIR"
@ -102,7 +103,7 @@ $OpenBSD: patch-scripts_mysqld_safe_sh,v 1.11 2006/10/14 05:04:54 brad Exp $
echo "`date +'%y%m%d %H:%M:%S mysqld started'`" >> $err_log
while true
do
@@ -392,35 +327,6 @@ do
@@ -393,35 +327,6 @@ do
break
fi

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

@ -1,7 +1,7 @@
$OpenBSD: patch-sql_mysqld_cc,v 1.7 2007/01/25 07:41:48 jakob Exp $
--- sql/mysqld.cc.orig Tue Jan 9 07:51:07 2007
+++ sql/mysqld.cc Sun Jan 14 21:29:24 2007
@@ -3418,7 +3418,7 @@ int main(int argc, char **argv)
$OpenBSD: patch-sql_mysqld_cc,v 1.8 2007/04/09 22:43:06 ckuethe Exp $
--- sql/mysqld.cc.orig Mon Mar 5 20:21:11 2007
+++ sql/mysqld.cc Sat Mar 31 19:02:57 2007
@@ -3431,7 +3431,7 @@ int main(int argc, char **argv)
init_ssl();
#ifdef HAVE_LIBWRAP

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-server,v 1.25 2007/01/25 07:41:48 jakob Exp $
@comment $OpenBSD: PLIST-server,v 1.26 2007/04/09 22:43:06 ckuethe Exp $
@newgroup _mysql:502
@newuser _mysql:502:_mysql:daemon:MySQL Account:/nonexistent:/sbin/nologin
bin/comp_err
@ -40,6 +40,7 @@ lib/mysql/libmysys.a
lib/mysql/libvio.a
libexec/mysqld
libexec/mysqlmanager
@man man/man1/make_win_bin_dist.1
@man man/man1/msql2mysql.1
@man man/man1/my_print_defaults.1
@man man/man1/myisam_ftdump.1
@ -49,12 +50,32 @@ libexec/mysqlmanager
@man man/man1/mysql.server.1
@man man/man1/mysql_explain_log.1
@man man/man1/mysql_fix_privilege_tables.1
@man man/man1/mysql_install_db.1
@man man/man1/mysql_upgrade.1
@man man/man1/mysql_zap.1
@man man/man1/mysqlaccess.1
@man man/man1/mysqld_multi.1
@man man/man1/mysqld_safe.1
@man man/man1/mysqlhotcopy.1
@man man/man1/ndb_config.1
@man man/man1/ndb_cpcd.1
@man man/man1/ndb_delete_all.1
@man man/man1/ndb_desc.1
@man man/man1/ndb_drop_index.1
@man man/man1/ndb_drop_table.1
@man man/man1/ndb_error_reporter.1
@man man/man1/ndb_mgm.1
@man man/man1/ndb_mgmd.1
@man man/man1/ndb_print_backup_file.1
@man man/man1/ndb_print_schema_file.1
@man man/man1/ndb_print_sys_file.1
@man man/man1/ndb_restore.1
@man man/man1/ndb_select_all.1
@man man/man1/ndb_select_count.1
@man man/man1/ndb_show_tables.1
@man man/man1/ndb_size.pl.1
@man man/man1/ndb_waiter.1
@man man/man1/ndbd.1
@man man/man1/perror.1
@man man/man1/replace.1
@man man/man1/safe_mysqld.1

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-tests,v 1.22 2007/01/25 07:41:48 jakob Exp $
@comment $OpenBSD: PLIST-tests,v 1.23 2007/04/09 22:43:06 ckuethe Exp $
share/mysql-test/
share/mysql-test/README
share/mysql-test/cacert.pem
@ -78,6 +78,7 @@ share/mysql-test/include/test_outfile.inc
share/mysql-test/include/testdb_only.inc
share/mysql-test/include/varchar.inc
share/mysql-test/include/wait_for_query_to_suceed.inc
share/mysql-test/include/wait_show_pattern.inc
share/mysql-test/include/wait_slave_status.inc
share/mysql-test/include/windows.inc
share/mysql-test/install_test_db
@ -102,6 +103,7 @@ share/mysql-test/mysql-test-run-shell
share/mysql-test/mysql-test-run.pl
share/mysql-test/r/
share/mysql-test/r/alias.result
share/mysql-test/r/alter_table-big.result
share/mysql-test/r/alter_table.result
share/mysql-test/r/analyse.result
share/mysql-test/r/analyze.result
@ -117,6 +119,7 @@ share/mysql-test/r/bdb-deadlock.result
share/mysql-test/r/bdb.result
share/mysql-test/r/bdb_cache.result
share/mysql-test/r/bdb_gis.result
share/mysql-test/r/bdb_notembedded.result
share/mysql-test/r/bench_count_distinct.result
share/mysql-test/r/big_test.require
share/mysql-test/r/bigint.result
@ -156,6 +159,7 @@ share/mysql-test/r/ctype_eucjpms.result
share/mysql-test/r/ctype_euckr.result
share/mysql-test/r/ctype_gb2312.result
share/mysql-test/r/ctype_gbk.result
share/mysql-test/r/ctype_hebrew.result
share/mysql-test/r/ctype_latin1.result
share/mysql-test/r/ctype_latin1_de.result
share/mysql-test/r/ctype_latin2.result
@ -194,6 +198,7 @@ share/mysql-test/r/fix_priv_tabs.result
share/mysql-test/r/flush.result
share/mysql-test/r/flush2.result
share/mysql-test/r/flush_block_commit.result
share/mysql-test/r/flush_block_commit_notembedded.result
share/mysql-test/r/flush_read_lock_kill.result
share/mysql-test/r/flush_table.result
share/mysql-test/r/foreign_key.result
@ -315,6 +320,7 @@ share/mysql-test/r/innodb_notembedded.result
share/mysql-test/r/innodb_timeout_rollback.result
share/mysql-test/r/innodb_unsafe_binlog.result
share/mysql-test/r/insert.result
share/mysql-test/r/insert_notembedded.result
share/mysql-test/r/insert_select-binlog.result
share/mysql-test/r/insert_select.result
share/mysql-test/r/insert_update.result
@ -422,6 +428,7 @@ share/mysql-test/r/overflow.result
share/mysql-test/r/packet.result
share/mysql-test/r/perror.result
share/mysql-test/r/preload.result
share/mysql-test/r/profiling.result
share/mysql-test/r/ps.result
share/mysql-test/r/ps_10nestset.result
share/mysql-test/r/ps_11bugs.result
@ -466,6 +473,7 @@ share/mysql-test/r/rpl_auto_increment.result
share/mysql-test/r/rpl_auto_increment_11932.result
share/mysql-test/r/rpl_change_master.result
share/mysql-test/r/rpl_charset.result
share/mysql-test/r/rpl_charset_sjis.result
share/mysql-test/r/rpl_commit_after_flush.result
share/mysql-test/r/rpl_create_database.result
share/mysql-test/r/rpl_ddl.result
@ -495,6 +503,7 @@ share/mysql-test/r/rpl_loaddata.result
share/mysql-test/r/rpl_loaddata_rule_m.result
share/mysql-test/r/rpl_loaddata_rule_s.result
share/mysql-test/r/rpl_loaddatalocal.result
share/mysql-test/r/rpl_locale.result
share/mysql-test/r/rpl_log.result
share/mysql-test/r/rpl_log_pos.result
share/mysql-test/r/rpl_many_optimize.result
@ -561,10 +570,12 @@ share/mysql-test/r/sp-threads.result
share/mysql-test/r/sp-vars.result
share/mysql-test/r/sp.result
share/mysql-test/r/sp_notembedded.result
share/mysql-test/r/sp_stress_case.result
share/mysql-test/r/sp_trans.result
share/mysql-test/r/sql_mode.result
share/mysql-test/r/ssl.result
share/mysql-test/r/ssl_compress.result
share/mysql-test/r/ssl_connect.result
share/mysql-test/r/ssl_des.result
share/mysql-test/r/status.result
share/mysql-test/r/strict.result
@ -674,6 +685,7 @@ share/mysql-test/std_data/warnings_loaddata.dat
share/mysql-test/std_data/words.dat
share/mysql-test/t/
share/mysql-test/t/alias.test
share/mysql-test/t/alter_table-big.test
share/mysql-test/t/alter_table.test
share/mysql-test/t/analyse.test
share/mysql-test/t/analyze.test
@ -692,6 +704,7 @@ share/mysql-test/t/bdb.test
share/mysql-test/t/bdb_cache-master.opt
share/mysql-test/t/bdb_cache.test
share/mysql-test/t/bdb_gis.test
share/mysql-test/t/bdb_notembedded.test
share/mysql-test/t/bench_count_distinct.test
share/mysql-test/t/bigint.test
share/mysql-test/t/binary.test
@ -730,6 +743,7 @@ share/mysql-test/t/ctype_eucjpms.test
share/mysql-test/t/ctype_euckr.test
share/mysql-test/t/ctype_gb2312.test
share/mysql-test/t/ctype_gbk.test
share/mysql-test/t/ctype_hebrew.test
share/mysql-test/t/ctype_latin1.test
share/mysql-test/t/ctype_latin1_de-master.opt
share/mysql-test/t/ctype_latin1_de.test
@ -772,6 +786,7 @@ share/mysql-test/t/flush.test
share/mysql-test/t/flush2-master.opt
share/mysql-test/t/flush2.test
share/mysql-test/t/flush_block_commit.test
share/mysql-test/t/flush_block_commit_notembedded.test
share/mysql-test/t/flush_read_lock_kill-master.opt
share/mysql-test/t/flush_read_lock_kill.test
share/mysql-test/t/flush_table.test
@ -870,6 +885,7 @@ share/mysql-test/t/innodb_timeout_rollback.test
share/mysql-test/t/innodb_unsafe_binlog-master.opt
share/mysql-test/t/innodb_unsafe_binlog.test
share/mysql-test/t/insert.test
share/mysql-test/t/insert_notembedded.test
share/mysql-test/t/insert_select-binlog.test
share/mysql-test/t/insert_select.test
share/mysql-test/t/insert_update.test
@ -988,6 +1004,7 @@ share/mysql-test/t/overflow.test
share/mysql-test/t/packet.test
share/mysql-test/t/perror.test
share/mysql-test/t/preload.test
share/mysql-test/t/profiling.test
share/mysql-test/t/ps-master.opt
share/mysql-test/t/ps.test
share/mysql-test/t/ps_10nestset.test
@ -1045,6 +1062,7 @@ share/mysql-test/t/rpl_auto_increment.test
share/mysql-test/t/rpl_auto_increment_11932.test
share/mysql-test/t/rpl_change_master.test
share/mysql-test/t/rpl_charset.test
share/mysql-test/t/rpl_charset_sjis.test
share/mysql-test/t/rpl_commit_after_flush.test
share/mysql-test/t/rpl_create_database-master.opt
share/mysql-test/t/rpl_create_database-slave.opt
@ -1095,6 +1113,7 @@ share/mysql-test/t/rpl_loaddata_rule_m.test
share/mysql-test/t/rpl_loaddata_rule_s-slave.opt
share/mysql-test/t/rpl_loaddata_rule_s.test
share/mysql-test/t/rpl_loaddatalocal.test
share/mysql-test/t/rpl_locale.test
share/mysql-test/t/rpl_log-master.opt
share/mysql-test/t/rpl_log-slave.opt
share/mysql-test/t/rpl_log.test
@ -1188,10 +1207,12 @@ share/mysql-test/t/sp-threads.test
share/mysql-test/t/sp-vars.test
share/mysql-test/t/sp.test
share/mysql-test/t/sp_notembedded.test
share/mysql-test/t/sp_stress_case.test
share/mysql-test/t/sp_trans.test
share/mysql-test/t/sql_mode.test
share/mysql-test/t/ssl.test
share/mysql-test/t/ssl_compress.test
share/mysql-test/t/ssl_connect.test
share/mysql-test/t/ssl_des-master.opt
share/mysql-test/t/ssl_des.test
share/mysql-test/t/status.test