Index: Makefile =================================================================== RCS file: /cvs/ports/databases/mysql/Makefile,v retrieving revision 1.154 diff -N -u Makefile --- Makefile 13 Jun 2009 21:51:30 -0000 1.154 +++ Makefile 29 Oct 2009 23:51:13 -0000 @@ -4,7 +4,7 @@ COMMENT-server= multithreaded SQL database (server) COMMENT-tests= multithreaded SQL database (regression test suite) -VERSION= 5.0.83 +VERSION= 5.0.87 DISTNAME= mysql-${VERSION} PKGNAME-main= mysql-client-${VERSION} PKGNAME-server= mysql-server-${VERSION} @@ -47,7 +47,7 @@ USE_LIBTOOL= Yes CONFIGURE_STYLE= autoconf # Should be 2.63 -AUTOCONF_VERSION= 2.61 +AUTOCONF_VERSION= 2.62 CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= --enable-thread-safe-client \ --localstatedir="${DB_DIR}" \ Index: distinfo =================================================================== RCS file: /cvs/ports/databases/mysql/distinfo,v retrieving revision 1.39 diff -N -u distinfo --- distinfo 13 Jun 2009 21:51:30 -0000 1.39 +++ distinfo 29 Oct 2009 23:51:13 -0000 @@ -1,5 +1,5 @@ -MD5 (mysql-5.0.83.tar.gz) = BROSBkoeMsylwjpZOQixDg== -RMD160 (mysql-5.0.83.tar.gz) = tqUlyGUyL7G3lsB9MGGTqY3jfCc= -SHA1 (mysql-5.0.83.tar.gz) = XoMaEvHauQLkr2489JW932+h/TM= -SHA256 (mysql-5.0.83.tar.gz) = 99Osh2k96ND03fRXwmgQew1TigtXfxwllqiijrC90cQ= -SIZE (mysql-5.0.83.tar.gz) = 35937401 +MD5 (mysql-5.0.87.tar.gz) = ZeYinMmLao1MUgbX/hbHvg== +RMD160 (mysql-5.0.87.tar.gz) = tqa/cV5Lm3HWLssT0uW0e1OAY3k= +SHA1 (mysql-5.0.87.tar.gz) = fMpyDoGw/OK/VOi4o18SavRF/Ec= +SHA256 (mysql-5.0.87.tar.gz) = R7MktNzMBr0gibLgKadipMFbmF7g0xoOkK6FrCa1wcI= +SIZE (mysql-5.0.87.tar.gz) = 22231820 Index: patches/patch-configure_in =================================================================== RCS file: /cvs/ports/databases/mysql/patches/patch-configure_in,v retrieving revision 1.26 diff -N -u patches/patch-configure_in --- patches/patch-configure_in 29 May 2009 08:42:06 -0000 1.26 +++ patches/patch-configure_in 29 Oct 2009 23:51:13 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-configure_in,v 1.26 2009/05/29 08:42:06 sthen Exp $ ---- configure.in.orig Thu May 7 17:11:51 2009 -+++ configure.in Thu May 28 17:45:20 2009 +--- configure.in.orig Fri Oct 16 08:18:59 2009 ++++ configure.in Fri Oct 30 10:27:04 2009 @@ -514,44 +514,7 @@ AC_SUBST(ICHECK) AC_PATH_PROG(PS, ps, ps) AC_MSG_CHECKING("how to check if pid exists") @@ -66,14 +66,14 @@ esac AC_CHECK_FUNCS(strtok_r pthread_init) -@@ -1753,29 +1717,6 @@ case $SYSTEM_TYPE in +@@ -1753,44 +1717,6 @@ case $SYSTEM_TYPE in AC_SYS_RESTARTABLE_SYSCALLS ;; esac - -# Build optimized or debug version ? -# First check for gcc and g++ --if test "$ac_cv_prog_gcc" = "yes" +-if test "$GCC" = "yes" -then - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="-O" @@ -81,17 +81,32 @@ -else - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="" -- OPTIMIZE_CFLAGS="-O" +- case $SYSTEM_TYPE in +- *solaris*) +- OPTIMIZE_CFLAGS="-O1" +- ;; +- *) +- OPTIMIZE_CFLAGS="-O" +- ;; +- esac -fi --if test "$ac_cv_prog_cxx_g" = "yes" +-if test "$GXX" = "yes" -then - DEBUG_CXXFLAGS="-g" - DEBUG_OPTIMIZE_CXX="-O" - OPTIMIZE_CXXFLAGS="$MAX_CXX_OPTIMIZE" -else -- DEBUG_CXXFLAGS="-g" - DEBUG_OPTIMIZE_CXX="" -- OPTIMIZE_CXXFLAGS="-O" +- case $SYSTEM_TYPE in +- *solaris*) +- DEBUG_CXXFLAGS="-g0" +- OPTIMIZE_CXXFLAGS="-O1" +- ;; +- *) +- DEBUG_CXXFLAGS="-g" +- OPTIMIZE_CXXFLAGS="-O" +- ;; +- esac -fi if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then Index: patches/patch-mysql-test_Makefile_in =================================================================== RCS file: /cvs/ports/databases/mysql/patches/patch-mysql-test_Makefile_in,v retrieving revision 1.20 diff -N -u patches/patch-mysql-test_Makefile_in --- patches/patch-mysql-test_Makefile_in 29 May 2009 08:42:06 -0000 1.20 +++ patches/patch-mysql-test_Makefile_in 29 Oct 2009 23:51:13 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-mysql-test_Makefile_in,v 1.20 2009/05/29 08:42:06 sthen Exp $ ---- mysql-test/Makefile.in.orig Thu May 7 17:19:52 2009 -+++ mysql-test/Makefile.in Thu May 28 17:45:20 2009 +--- mysql-test/Makefile.in.orig Tue Jul 7 23:07:24 2009 ++++ mysql-test/Makefile.in Mon Jul 27 11:33:14 2009 @@ -367,7 +367,7 @@ zlib_dir = @zlib_dir@ @HAVE_NDBCLUSTER_DB_TRUE@DIST_SUBDIRS = ndb @HAVE_NDBCLUSTER_DB_FALSE@USE_NDBCLUSTER = \"\" @@ -9,4 +9,4 @@ +benchdir_root = $(datadir) testdir = $(benchdir_root)/mysql-test EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS) - EXTRA_DIST = $(EXTRA_SCRIPTS) suite + EXTRA_DIST = $(EXTRA_SCRIPTS) suite collections Index: patches/patch-scripts_mysqld_safe_sh =================================================================== RCS file: /cvs/ports/databases/mysql/patches/patch-scripts_mysqld_safe_sh,v retrieving revision 1.12 diff -N -u patches/patch-scripts_mysqld_safe_sh --- patches/patch-scripts_mysqld_safe_sh 9 Apr 2007 22:43:06 -0000 1.12 +++ patches/patch-scripts_mysqld_safe_sh 29 Oct 2009 23:51:13 -0000 @@ -1,7 +1,7 @@ $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() { +--- scripts/mysqld_safe.sh.orig Thu Sep 10 05:04:45 2009 ++++ scripts/mysqld_safe.sh Mon Oct 12 12:20:22 2009 +@@ -107,83 +107,13 @@ parse_arguments() { } @@ -14,16 +14,27 @@ -MY_PWD=`pwd` -# Check for the directories we would expect from a binary release install --if test -f ./share/mysql/english/errmsg.sys -a -x ./bin/mysqld +-if test -n "$MY_BASEDIR_VERSION" -a -d "$MY_BASEDIR_VERSION" -then +- # BASEDIR is already overridden on command line. Do not re-set. + +- # Use BASEDIR to discover le. +- if test -x "$MY_BASEDIR_VERSION/libexec/mysqld" +- then +- ledir="$MY_BASEDIR_VERSION/libexec" +- else +- ledir="$MY_BASEDIR_VERSION/bin" +- fi +-elif test -f ./share/mysql/english/errmsg.sys -a -x "$MY_PWD/bin/mysqld" +-then - MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are - ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is +- ledir="$MY_PWD/bin" # Where mysqld is -# Check for the directories we would expect from a source install --elif test -f ./share/mysql/english/errmsg.sys -a \ -- -x ./libexec/mysqld +-elif test -f ./share/mysql/english/errmsg.sys -a -x "$MY_PWD/libexec/mysqld" -then - MY_BASEDIR_VERSION=$MY_PWD # Where libexec, share and var are -- ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld is +- ledir="$MY_PWD/libexec" # Where mysqld is -# Since we didn't find anything, used the compiled-in defaults -else - MY_BASEDIR_VERSION=@prefix@ @@ -79,7 +90,7 @@ niceness=0 # these rely on $DATADIR by default, so we'll set them later on -@@ -210,8 +150,8 @@ mysql_unix_port_dir=`dirname $safe_mysql_unix_port` +@@ -224,8 +154,8 @@ mysql_unix_port_dir=`dirname $safe_mysql_unix_port` if [ ! -d $mysql_unix_port_dir ] then mkdir $mysql_unix_port_dir @@ -90,7 +101,7 @@ fi # Use the mysqld-max binary by default if the user doesn't specify a binary -@@ -371,12 +311,6 @@ fi +@@ -385,12 +315,6 @@ fi echo "Starting $MYSQLD daemon with databases from $DATADIR" @@ -103,7 +114,7 @@ echo "`date +'%y%m%d %H:%M:%S mysqld started'`" >> $err_log while true do -@@ -393,35 +327,6 @@ do +@@ -407,35 +331,6 @@ do break fi Index: patches/patch-sql_mysqld_cc =================================================================== RCS file: /cvs/ports/databases/mysql/patches/patch-sql_mysqld_cc,v retrieving revision 1.15 diff -N -u patches/patch-sql_mysqld_cc --- patches/patch-sql_mysqld_cc 29 May 2009 08:42:06 -0000 1.15 +++ patches/patch-sql_mysqld_cc 29 Oct 2009 23:51:13 -0000 @@ -1,8 +1,8 @@ $OpenBSD: patch-sql_mysqld_cc,v 1.15 2009/05/29 08:42:06 sthen Exp $ ---- sql/mysqld.cc.orig Thu May 7 17:15:02 2009 -+++ sql/mysqld.cc Thu May 28 17:45:10 2009 -@@ -3750,7 +3750,7 @@ int main(int argc, char **argv) - init_ssl(); +--- sql/mysqld.cc.orig Thu Sep 10 05:04:53 2009 ++++ sql/mysqld.cc Mon Oct 12 12:10:44 2009 +@@ -3752,7 +3752,7 @@ int main(int argc, char **argv) + select_thread_in_use=1; #ifdef HAVE_LIBWRAP - libwrapName= my_progname+dirname_length(my_progname); Index: pkg/PLIST-server =================================================================== RCS file: /cvs/ports/databases/mysql/pkg/PLIST-server,v retrieving revision 1.30 diff -N -u pkg/PLIST-server --- pkg/PLIST-server 24 Aug 2008 08:40:03 -0000 1.30 +++ pkg/PLIST-server 29 Oct 2009 23:51:13 -0000 @@ -42,8 +42,6 @@ @bin libexec/mysqlmanager @man man/man1/comp_err.1 @man man/man1/innochecksum.1 -@man man/man1/make_win_bin_dist.1 -@man man/man1/make_win_src_distribution.1 @man man/man1/msql2mysql.1 @man man/man1/my_print_defaults.1 @man man/man1/myisam_ftdump.1 Index: pkg/PLIST-tests =================================================================== RCS file: /cvs/ports/databases/mysql/pkg/PLIST-tests,v retrieving revision 1.31 diff -N -u pkg/PLIST-tests --- pkg/PLIST-tests 13 Jun 2009 21:51:30 -0000 1.31 +++ pkg/PLIST-tests 29 Oct 2009 23:51:15 -0000 @@ -4,6 +4,7 @@ @man man/man1/mysql_client_test.1 share/mysql-test/ share/mysql-test/README +share/mysql-test/collections/ share/mysql-test/include/ share/mysql-test/include/add_anonymous_users.inc share/mysql-test/include/analyze_failure_sync_with_master.test @@ -88,7 +89,9 @@ share/mysql-test/include/ps_query.inc share/mysql-test/include/ps_renew.inc share/mysql-test/include/report-features.test +share/mysql-test/include/rpl_loaddata_charset.inc share/mysql-test/include/rpl_stmt_seq.inc +share/mysql-test/include/rpl_trigger_common.inc share/mysql-test/include/show_binary_logs.inc share/mysql-test/include/show_binlog_events.inc share/mysql-test/include/show_binlog_events2.inc @@ -172,6 +175,8 @@ share/mysql-test/r/blackhole.result share/mysql-test/r/bool.result share/mysql-test/r/bootstrap.result +share/mysql-test/r/bug40113.result +share/mysql-test/r/bug46080.result share/mysql-test/r/bulk_replace.result share/mysql-test/r/case.result share/mysql-test/r/case_sensitive_file_system.require @@ -242,6 +247,7 @@ share/mysql-test/r/federated_archive.result share/mysql-test/r/federated_bug_13118.result share/mysql-test/r/federated_bug_25714.result +share/mysql-test/r/federated_debug.result share/mysql-test/r/federated_disabled.result share/mysql-test/r/federated_innodb.result share/mysql-test/r/fix_priv_tables.result @@ -372,6 +378,7 @@ share/mysql-test/r/innodb-ucs2.result share/mysql-test/r/innodb.result share/mysql-test/r/innodb_bug35220.result +share/mysql-test/r/innodb_bug40565.result share/mysql-test/r/innodb_bug42419.result share/mysql-test/r/innodb_cache.result share/mysql-test/r/innodb_gis.result @@ -430,6 +437,7 @@ share/mysql-test/r/myisam.result share/mysql-test/r/myisampack.result share/mysql-test/r/mysql-bug41486.result +share/mysql-test/r/mysql-bug45236.result share/mysql-test/r/mysql.result share/mysql-test/r/mysql_client_test.result share/mysql-test/r/mysql_comments.result @@ -566,6 +574,7 @@ share/mysql-test/r/rpl_auto_increment.result share/mysql-test/r/rpl_auto_increment_11932.result share/mysql-test/r/rpl_auto_increment_bug33029.result +share/mysql-test/r/rpl_begin_commit_rollback.result share/mysql-test/r/rpl_bug33931.result share/mysql-test/r/rpl_bug38694.result share/mysql-test/r/rpl_change_master.result @@ -654,7 +663,8 @@ share/mysql-test/r/rpl_temporary.result share/mysql-test/r/rpl_timezone.result share/mysql-test/r/rpl_transaction.result -share/mysql-test/r/rpl_trigger.result +share/mysql-test/r/rpl_trigger_not_windows.result +share/mysql-test/r/rpl_trigger_windows.result share/mysql-test/r/rpl_trunc_temp.result share/mysql-test/r/rpl_until.result share/mysql-test/r/rpl_user.result @@ -678,6 +688,7 @@ 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-fib.result share/mysql-test/r/sp-prelocking.result share/mysql-test/r/sp-security.result share/mysql-test/r/sp-threads.result @@ -705,6 +716,7 @@ share/mysql-test/r/subselect.result share/mysql-test/r/subselect2.result share/mysql-test/r/subselect3.result +share/mysql-test/r/subselect4.result share/mysql-test/r/subselect_gis.result share/mysql-test/r/subselect_innodb.result share/mysql-test/r/subselect_notembedded.result @@ -769,6 +781,7 @@ share/mysql-test/std_data/Index.xml share/mysql-test/std_data/Moscow_leap share/mysql-test/std_data/bad_gis_data.dat +share/mysql-test/std_data/binlog_transaction.000001 share/mysql-test/std_data/bug15328.cnf share/mysql-test/std_data/bug16266.000001 share/mysql-test/std_data/bug19371.MYD @@ -809,6 +822,7 @@ share/mysql-test/std_data/loaddata6.dat share/mysql-test/std_data/loaddata_dq.dat share/mysql-test/std_data/loaddata_pair.dat +share/mysql-test/std_data/loaddata_utf8.dat share/mysql-test/std_data/master-bin.000001 share/mysql-test/std_data/ndb_backup50_data_be/ share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data @@ -849,7 +863,6 @@ share/mysql-test/suite/funcs_1/datadict/basics_mixed1.inc share/mysql-test/suite/funcs_1/datadict/basics_mixed2.inc share/mysql-test/suite/funcs_1/datadict/basics_mixed3.inc -share/mysql-test/suite/funcs_1/datadict/charset_collation.inc share/mysql-test/suite/funcs_1/datadict/columns.inc share/mysql-test/suite/funcs_1/datadict/datadict.pre share/mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc @@ -888,9 +901,7 @@ share/mysql-test/suite/funcs_1/lib/DataGen_local.pl share/mysql-test/suite/funcs_1/lib/DataGen_modify.pl share/mysql-test/suite/funcs_1/r/ -share/mysql-test/suite/funcs_1/r/charset_collation_1.result -share/mysql-test/suite/funcs_1/r/charset_collation_2.result -share/mysql-test/suite/funcs_1/r/charset_collation_3.result +share/mysql-test/suite/funcs_1/r/charset_collation.result share/mysql-test/suite/funcs_1/r/innodb_bitdata.result share/mysql-test/suite/funcs_1/r/innodb_cursors.result share/mysql-test/suite/funcs_1/r/innodb_func_view.result @@ -1014,9 +1025,7 @@ share/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc share/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc share/mysql-test/suite/funcs_1/t/ -share/mysql-test/suite/funcs_1/t/charset_collation_1.test -share/mysql-test/suite/funcs_1/t/charset_collation_2.test -share/mysql-test/suite/funcs_1/t/charset_collation_3.test +share/mysql-test/suite/funcs_1/t/charset_collation.test share/mysql-test/suite/funcs_1/t/disabled.def share/mysql-test/suite/funcs_1/t/innodb_bitdata.test share/mysql-test/suite/funcs_1/t/innodb_cursors.test @@ -1458,6 +1467,10 @@ share/mysql-test/t/blackhole.test share/mysql-test/t/bool.test share/mysql-test/t/bootstrap.test +share/mysql-test/t/bug40113-master.opt +share/mysql-test/t/bug40113.test +share/mysql-test/t/bug46080-master.opt +share/mysql-test/t/bug46080.test share/mysql-test/t/bulk_replace.test share/mysql-test/t/case.test share/mysql-test/t/cast.test @@ -1534,6 +1547,8 @@ share/mysql-test/t/federated_archive.test share/mysql-test/t/federated_bug_13118.test share/mysql-test/t/federated_bug_25714.test +share/mysql-test/t/federated_debug-master.opt +share/mysql-test/t/federated_debug.test share/mysql-test/t/federated_disabled-master.opt share/mysql-test/t/federated_disabled.test share/mysql-test/t/federated_innodb-slave.opt @@ -1635,6 +1650,7 @@ share/mysql-test/t/innodb-ucs2.test share/mysql-test/t/innodb.test share/mysql-test/t/innodb_bug35220.test +share/mysql-test/t/innodb_bug40565.test share/mysql-test/t/innodb_bug42419.test share/mysql-test/t/innodb_cache-master.opt share/mysql-test/t/innodb_cache.test @@ -1712,6 +1728,7 @@ share/mysql-test/t/myisam.test share/mysql-test/t/myisampack.test share/mysql-test/t/mysql-bug41486.test +share/mysql-test/t/mysql-bug45236.test share/mysql-test/t/mysql.test share/mysql-test/t/mysql_client_test.opt share/mysql-test/t/mysql_client_test.test @@ -1864,6 +1881,8 @@ share/mysql-test/t/rpl_auto_increment.test share/mysql-test/t/rpl_auto_increment_11932.test share/mysql-test/t/rpl_auto_increment_bug33029.test +share/mysql-test/t/rpl_begin_commit_rollback-slave.opt +share/mysql-test/t/rpl_begin_commit_rollback.test share/mysql-test/t/rpl_bug33931-slave.opt share/mysql-test/t/rpl_bug33931.test share/mysql-test/t/rpl_bug38694-slave.opt @@ -2010,7 +2029,8 @@ share/mysql-test/t/rpl_transaction-master.opt share/mysql-test/t/rpl_transaction-slave.opt share/mysql-test/t/rpl_transaction.test -share/mysql-test/t/rpl_trigger.test +share/mysql-test/t/rpl_trigger_not_windows.test +share/mysql-test/t/rpl_trigger_windows.test share/mysql-test/t/rpl_trunc_temp.test share/mysql-test/t/rpl_until.test share/mysql-test/t/rpl_user.test @@ -2035,6 +2055,7 @@ 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-fib.test share/mysql-test/t/sp-prelocking.test share/mysql-test/t/sp-security.test share/mysql-test/t/sp-threads.test @@ -2062,6 +2083,7 @@ share/mysql-test/t/subselect.test share/mysql-test/t/subselect2.test share/mysql-test/t/subselect3.test +share/mysql-test/t/subselect4.test share/mysql-test/t/subselect_gis.test share/mysql-test/t/subselect_innodb.test share/mysql-test/t/subselect_notembedded.test