can you fix the packaging? you added tests files into the -main package, they should be in -tests.
Frank Denis [2007-01-07, 19:25:45]: > Hello, > > Here's an update of MySQL to version 5.0.32. Works for me on i386. > > Best regards, > -Frank. > > -- > Frank Denis - frank [at] nailbox.fr - NSI / Young Nails / Akzentz nail tech > Authorized Akzentz dealer - http://www.nailbox.fr > http://forum.manucure.info - http://www.manucure-pro.com > diff -urN databases/mysql.old/Makefile databases/mysql/Makefile > --- databases/mysql.old/Makefile Thu Dec 7 12:42:37 2006 > +++ databases/mysql/Makefile Sun Jan 7 19:11:30 2007 > @@ -9,17 +9,17 @@ > COMMENT-server= "multithreaded SQL database (server)" > COMMENT-tests= "multithreaded SQL database (regression test suite)" > > -VERSION= 5.0.27 > +VERSION= 5.0.32 > DISTNAME= mysql-${VERSION} > -PKGNAME-main= mysql-client-${VERSION}p1 > -PKGNAME-server= mysql-server-${VERSION}p0 > +PKGNAME-main= mysql-client-${VERSION} > +PKGNAME-server= mysql-server-${VERSION} > PKGNAME-tests= mysql-tests-${VERSION} > CATEGORIES= databases > V= MySQL-5.0 > SHARED_LIBS += mysqlclient_r 18.0 # .15.0 > SHARED_LIBS += mysqlclient 18.0 # .15.0 > > -MASTER_SITES= http://mysql.serenitynet.com/Downloads/$V/ > +MASTER_SITES= ftp://ftp.mysql.com/pub/mysql/src/ > > HOMEPAGE= http://www.mysql.com/ > > diff -urN databases/mysql.old/distinfo databases/mysql/distinfo > --- databases/mysql.old/distinfo Sun Oct 29 21:28:24 2006 > +++ databases/mysql/distinfo Sun Jan 7 16:56:16 2007 > @@ -1,4 +1,4 @@ > -MD5 (mysql-5.0.27.tar.gz) = 584d423440a9d9c859678e3d4f2690b3 > -RMD160 (mysql-5.0.27.tar.gz) = 3de75b959d04e002b2e4cfe322abdb48bf2f80fd > -SHA1 (mysql-5.0.27.tar.gz) = 656de9c03f07c2371f40277076ec2fc6eac51ec8 > -SIZE (mysql-5.0.27.tar.gz) = 25867740 > +MD5 (mysql-5.0.32.tar.gz) = ccdcddf97fab88d7d6bd43dff73bf61b > +RMD160 (mysql-5.0.32.tar.gz) = 14639884c1bdde356654c4c5fc75d2ff613cd1d1 > +SHA1 (mysql-5.0.32.tar.gz) = daa13b48b0ddca029bdf97b578481a9cf3e4ac15 > +SIZE (mysql-5.0.32.tar.gz) = 24820282 > diff -urN databases/mysql.old/patches/patch-configure_in > databases/mysql/patches/patch-configure_in > --- databases/mysql.old/patches/patch-configure_in Sat Oct 14 07:04:54 2006 > +++ databases/mysql/patches/patch-configure_in Sun Jan 7 17:16:35 2007 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-configure_in,v 1.19 2006/10/14 05:04:54 brad Exp $ > ---- configure.in.orig Wed Oct 4 07:24:11 2006 > -+++ configure.in Thu Oct 12 05:19:50 2006 > -@@ -453,44 +453,7 @@ AC_SUBST(MAKEINDEX) > +--- configure.in.orig Wed Dec 20 12:14:25 2006 > ++++ configure.in Sun Jan 7 17:10:46 2007 > +@@ -457,44 +457,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 @@ > AC_SUBST(FIND_PROC) > AC_MSG_RESULT("$FIND_PROC") > > -@@ -791,7 +754,8 @@ AC_ARG_WITH(libwrap, > +@@ -795,7 +758,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 @@ > int allow_severity = 0; > int deny_severity = 0; > > -@@ -1555,7 +1519,7 @@ then > +@@ -1563,7 +1527,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 @@ > > esac > AC_CHECK_FUNCS(strtok_r pthread_init) > -@@ -1603,29 +1567,6 @@ case $SYSTEM_TYPE in > +@@ -1611,29 +1575,6 @@ case $SYSTEM_TYPE in > AC_SYS_RESTARTABLE_SYSCALLS > ;; > esac > diff -urN databases/mysql.old/patches/patch-mysql-test_Makefile_in > databases/mysql/patches/patch-mysql-test_Makefile_in > --- databases/mysql.old/patches/patch-mysql-test_Makefile_in Sat Oct 14 > 07:04:54 2006 > +++ databases/mysql/patches/patch-mysql-test_Makefile_in Sun Jan 7 > 17:16:35 2007 > @@ -1,12 +1,12 @@ > $OpenBSD: patch-mysql-test_Makefile_in,v 1.12 2006/10/14 05:04:54 brad Exp $ > ---- mysql-test/Makefile.in.orig Wed Oct 4 07:25:44 2006 > -+++ mysql-test/Makefile.in Thu Oct 12 05:18:57 2006 > -@@ -388,7 +388,7 @@ zlib_dir = @zlib_dir@ > +--- mysql-test/Makefile.in.orig Wed Dec 20 12:15:49 2006 > ++++ mysql-test/Makefile.in Sun Jan 7 17:11:44 2007 > +@@ -373,7 +373,7 @@ zlib_dir = @zlib_dir@ > @[EMAIL PROTECTED] = ndb > @[EMAIL PROTECTED] = \"\" > @[EMAIL PROTECTED] = \"--ndbcluster\" > -benchdir_root = $(prefix) > +benchdir_root = $(datadir) > testdir = $(benchdir_root)/mysql-test > - EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh valgrind.supp > $(PRESCRIPTS) > - EXTRA_DIST = $(EXTRA_SCRIPTS) > + EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh valgrind.supp > $(PRESCRIPTS) > + EXTRA_DIST = $(EXTRA_SCRIPTS) > diff -urN databases/mysql.old/patches/patch-mysql-test_mysql-test-run_sh > databases/mysql/patches/patch-mysql-test_mysql-test-run_sh > --- databases/mysql.old/patches/patch-mysql-test_mysql-test-run_sh Sun Apr > 30 22:55:44 2006 > +++ databases/mysql/patches/patch-mysql-test_mysql-test-run_sh Thu Jan > 1 01:00:00 1970 > @@ -1,11 +0,0 @@ > -$OpenBSD: patch-mysql-test_mysql-test-run_sh,v 1.7 2006/04/30 20:55:44 brad > Exp $ > ---- mysql-test/mysql-test-run.sh.orig Fri Mar 31 12:10:41 2006 > -+++ mysql-test/mysql-test-run.sh Mon Apr 17 01:25:23 2006 > -@@ -101,7 +101,6 @@ sleep_until_file_created () > - loop=`expr $loop - 1` > - done > - echo "ERROR: $file was not created in $org_time seconds; Aborting" > -- exit 1; > - } > - > - # For the future > diff -urN databases/mysql.old/patches/patch-scripts_Makefile_in > databases/mysql/patches/patch-scripts_Makefile_in > --- databases/mysql.old/patches/patch-scripts_Makefile_in Sat Oct 14 > 07:04:54 2006 > +++ databases/mysql/patches/patch-scripts_Makefile_in Sun Jan 7 17:16:34 2007 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-scripts_Makefile_in,v 1.5 2006/10/14 05:04:54 brad Exp $ > ---- scripts/Makefile.in.orig Wed Oct 4 07:26:06 2006 > -+++ scripts/Makefile.in Thu Oct 12 05:18:57 2006 > -@@ -652,6 +652,7 @@ mysqlbug: ${top_builddir}/config.status > +--- scripts/Makefile.in.orig Wed Dec 20 12:16:10 2006 > ++++ scripts/Makefile.in Sun Jan 7 17:12:06 2007 > +@@ -653,6 +653,7 @@ mysqlbug: ${top_builddir}/config.status > -e 's!@''datadir''@!$(datadir)!g' \ > -e 's!@''localstatedir''@!$(localstatedir)!g' \ > -e 's!@''libexecdir''@!$(libexecdir)!g' \ > diff -urN databases/mysql.old/patches/patch-scripts_mysql_install_db_sh > databases/mysql/patches/patch-scripts_mysql_install_db_sh > --- databases/mysql.old/patches/patch-scripts_mysql_install_db_sh Sat Oct > 14 07:04:54 2006 > +++ databases/mysql/patches/patch-scripts_mysql_install_db_sh Sun Jan 7 > 17:16:35 2007 > @@ -1,6 +1,6 @@ > $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.4 2006/10/14 05:04:54 brad > Exp $ > ---- scripts/mysql_install_db.sh.orig Wed Oct 4 07:24:11 2006 > -+++ scripts/mysql_install_db.sh Thu Oct 12 05:18:57 2006 > +--- scripts/mysql_install_db.sh.orig Wed Dec 20 12:14:26 2006 > ++++ scripts/mysql_install_db.sh Sun Jan 7 17:15:11 2007 > @@ -7,10 +7,9 @@ > # > # All unrecognized arguments to this script are passed to mysqld. > @@ -20,9 +20,9 @@ > case "$arg" in > - --force) force=1 ;; > --basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; > + --srcdir=*) srcdir=`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,22 +34,28 @@ > *) > if test -n "$pick_args" > then > -@@ -78,7 +75,6 @@ ldata= > - execdir= > +@@ -80,7 +77,6 @@ execdir= > bindir= > basedir= > + srcdir= > -force=0 > verbose=0 > fill_help_tables="" > > -@@ -127,44 +123,28 @@ mysqld=$execdir/mysqld > +@@ -135,50 +131,28 @@ mysqld=$execdir/mysqld > mysqld_opt="" > scriptdir=$bindir > > -if test "$windows" = 1 > -then > - mysqld="./sql/mysqld" > -- mysqld_opt="--language=./sql/share/english" > +- if test -n "$srcdir" -a -f $srcdir/sql/share/english/errmsg.sys > +- then > +- langdir=$srcdir/sql/share/english > +- else > +- langdir=./sql/share/english > +- fi > +- mysqld_opt="--language=$langdir" > - scriptdir="./scripts" > -fi > - > @@ -86,17 +92,17 @@ > - echo "If you want to solve this at a later stage, restart this script > with" > - echo "the --force option" > - exit 1 > -+ then > ++ then > + echo "Neither host '$hostname' nor 'localhost' could be looked up with" > + echo "$bindir/resolveip" > + echo "Please configure the 'hostname' command to return a correct > hostname." > + echo "If you want to solve this at a later stage, restart this script > with" > + echo "the --force option" > -+ exit 1 > ++ exit 1 > 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 > +@@ -186,7 +160,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 +110,7 @@ > fi > > if test "$ip_only" = "1" > -@@ -183,12 +162,10 @@ fi > +@@ -197,12 +170,10 @@ fi > > # Create database directories mysql & test > > @@ -121,7 +127,7 @@ > > if test ! -f $mdata/db.frm > then > -@@ -206,10 +183,7 @@ if test -n "$user"; then > +@@ -220,10 +191,7 @@ if test -n "$user"; then > args="$args --user=$user" > fi > > @@ -133,7 +139,7 @@ > 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 > +@@ -232,10 +200,7 @@ if $scriptdir/mysql_create_system_tables > then > if test -n "$fill_help_tables" > then > @@ -145,7 +151,7 @@ > (echo "use mysql;"; cat $fill_help_tables) | eval > "$mysqld_install_cmd_line" > res=$? > if test $res != 0 > -@@ -232,15 +203,6 @@ then > +@@ -246,15 +211,6 @@ then > echo "" > fi > fi > @@ -161,7 +167,7 @@ > 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 > +@@ -270,21 +226,11 @@ then > echo "able to use the new GRANT command!" > fi > echo > diff -urN databases/mysql.old/patches/patch-sql_mysqld_cc > databases/mysql/patches/patch-sql_mysqld_cc > --- databases/mysql.old/patches/patch-sql_mysqld_cc Sat Oct 14 07:04:54 2006 > +++ databases/mysql/patches/patch-sql_mysqld_cc Sun Jan 7 17:16:34 2007 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-sql_mysqld_cc,v 1.6 2006/10/14 05:04:54 brad Exp $ > ---- sql/mysqld.cc.orig Wed Oct 4 07:24:09 2006 > -+++ sql/mysqld.cc Thu Oct 12 05:18:57 2006 > -@@ -3377,7 +3377,7 @@ int main(int argc, char **argv) > +--- sql/mysqld.cc.orig Wed Dec 20 12:14:10 2006 > ++++ sql/mysqld.cc Sun Jan 7 17:15:57 2007 > +@@ -3418,7 +3418,7 @@ int main(int argc, char **argv) > init_ssl(); > > #ifdef HAVE_LIBWRAP > diff -urN databases/mysql.old/pkg/PLIST-main databases/mysql/pkg/PLIST-main > --- databases/mysql.old/pkg/PLIST-main Thu Dec 7 12:42:37 2006 > +++ databases/mysql/pkg/PLIST-main Sun Jan 7 17:54:48 2007 > @@ -53,8 +53,10 @@ > lib/mysql/libmysqlclient_r.a > lib/mysql/libmysqlclient_r.la > %%SHARED%% > [EMAIL PROTECTED] man/man1/my_print_defaults.1 > @man man/man1/mysql.1 > @man man/man1/mysql_config.1 > [EMAIL PROTECTED] man/man1/mysql_tzinfo_to_sql.1 > @man man/man1/mysqladmin.1 > @man man/man1/mysqlbinlog.1 > @man man/man1/mysqlcheck.1 > @@ -62,3 +64,59 @@ > @man man/man1/mysqlimport.1 > @man man/man1/mysqlman.1 > @man man/man1/mysqlshow.1 > +share/mysql-test/include/analyze_failure_sync_with_master.test > +share/mysql-test/include/check-testcase.test > +share/mysql-test/include/innodb_rollback_on_timeout.inc > +share/mysql-test/include/report-features.test > +share/mysql-test/include/wait_for_query_to_suceed.inc > +share/mysql-test/lib/mtr_im.pl > +share/mysql-test/lib/mtr_unique.pl > +share/mysql-test/mysql-test-run-shell > +share/mysql-test/r/execution_constants.result > +share/mysql-test/r/fix_priv_tables.result > +share/mysql-test/r/fix_priv_tabs.result > +share/mysql-test/r/flush2.result > +share/mysql-test/r/have_mysql_upgrade.result > +share/mysql-test/r/innodb_timeout_rollback.result > +share/mysql-test/r/mysql_upgrade.result > +share/mysql-test/r/mysqladmin.result > +share/mysql-test/r/round.result > +share/mysql-test/r/rpl_packet.result > +share/mysql-test/r/ssl_des.result > +share/mysql-test/r/subselect3.result > +share/mysql-test/r/timezone4.result > +share/mysql-test/std_data/bad_gis_data.dat > +share/mysql-test/std_data/bug19371.MYD > +share/mysql-test/std_data/bug19371.MYI > +share/mysql-test/std_data/bug19371.frm > +share/mysql-test/std_data/server-cert-des.pem > +share/mysql-test/std_data/server-key-des.pem > +share/mysql-test/t/execution_constants.test > +share/mysql-test/t/fix_priv_tables.test > +share/mysql-test/t/flush2-master.opt > +share/mysql-test/t/flush2.test > +share/mysql-test/t/innodb_mysql-master.opt > +share/mysql-test/t/innodb_timeout_rollback-master.opt > +share/mysql-test/t/innodb_timeout_rollback.test > +share/mysql-test/t/log.sh > +share/mysql-test/t/mysql_delimiter_19799.sql > +share/mysql-test/t/mysql_upgrade.test > +share/mysql-test/t/mysqladmin.test > +share/mysql-test/t/ps-master.opt > +share/mysql-test/t/round.test > +share/mysql-test/t/rpl_empty_master_crash-master.opt > +share/mysql-test/t/rpl_packet-master.opt > +share/mysql-test/t/rpl_packet-slave.opt > +share/mysql-test/t/rpl_packet.test > +share/mysql-test/t/show_check-master.opt > +share/mysql-test/t/ssl_des-master.opt > +share/mysql-test/t/ssl_des.test > +share/mysql-test/t/subselect3.test > +share/mysql-test/t/system_mysql_db_fix30020-master.opt > +share/mysql-test/t/system_mysql_db_fix30020.test > +share/mysql-test/t/system_mysql_db_fix40123-master.opt > +share/mysql-test/t/system_mysql_db_fix40123.test > +share/mysql-test/t/timezone4-master.opt > +share/mysql-test/t/timezone4.test > +share/mysql-test/t/utils.sh > +share/mysql-test/t/wait_for_socket.sh > diff -urN databases/mysql.old/pkg/PLIST-server > databases/mysql/pkg/PLIST-server > --- databases/mysql.old/pkg/PLIST-server Wed Oct 18 20:35:48 2006 > +++ databases/mysql/pkg/PLIST-server Sun Jan 7 17:54:48 2007 > @@ -51,11 +51,9 @@ > @man man/man1/mysql_upgrade.1 > @man man/man1/mysql_zap.1 > @man man/man1/mysqlaccess.1 > [EMAIL PROTECTED] man/man1/mysqld.1 > @man man/man1/mysqld_multi.1 > @man man/man1/mysqld_safe.1 > @man man/man1/mysqlhotcopy.1 > [EMAIL PROTECTED] man/man1/mysqlmanager.1 > @man man/man1/perror.1 > @man man/man1/replace.1 > @man man/man1/safe_mysqld.1 > diff -urN databases/mysql.old/pkg/PLIST-tests databases/mysql/pkg/PLIST-tests > --- databases/mysql.old/pkg/PLIST-tests Sat Oct 14 07:04:54 2006 > +++ databases/mysql/pkg/PLIST-tests Sun Jan 7 17:54:49 2007 > @@ -53,7 +53,6 @@ > share/mysql-test/include/loaddata_autocom.inc > share/mysql-test/include/master-slave.inc > share/mysql-test/include/mysqltest-x.inc > -share/mysql-test/include/mysqltest_while.inc > share/mysql-test/include/ndb_default_cluster.inc > share/mysql-test/include/not_as_root.inc > share/mysql-test/include/not_embedded.inc > @@ -68,8 +67,6 @@ > share/mysql-test/include/rpl_stmt_seq.inc > share/mysql-test/include/show_msg.inc > share/mysql-test/include/show_msg80.inc > -share/mysql-test/include/sourced.inc > -share/mysql-test/include/sourced1.inc > share/mysql-test/include/sp-vars.inc > share/mysql-test/include/strict_autoinc.inc > share/mysql-test/include/system_db_struct.inc > @@ -446,12 +443,10 @@ > share/mysql-test/r/rpl000013.result > share/mysql-test/r/rpl000015.result > share/mysql-test/r/rpl000017.result > -share/mysql-test/r/rpl000018.result > share/mysql-test/r/rpl_EE_error.result > share/mysql-test/r/rpl_alter.result > share/mysql-test/r/rpl_auto_increment.result > share/mysql-test/r/rpl_auto_increment_11932.result > -share/mysql-test/r/rpl_chain_temp_table.result > share/mysql-test/r/rpl_change_master.result > share/mysql-test/r/rpl_charset.result > share/mysql-test/r/rpl_commit_after_flush.result > @@ -467,12 +462,10 @@ > share/mysql-test/r/rpl_empty_master_crash.result > share/mysql-test/r/rpl_error_ignored_table.result > share/mysql-test/r/rpl_failed_optimize.result > -share/mysql-test/r/rpl_failsafe.result > share/mysql-test/r/rpl_flush_log_loop.result > share/mysql-test/r/rpl_flush_tables.result > share/mysql-test/r/rpl_free_items.result > share/mysql-test/r/rpl_get_lock.result > -share/mysql-test/r/rpl_heap.result > share/mysql-test/r/rpl_ignore_grant.result > share/mysql-test/r/rpl_ignore_revoke.result > share/mysql-test/r/rpl_ignore_table.result > @@ -1005,13 +998,11 @@ > 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_EE_error.test > share/mysql-test/t/rpl_alter.test > share/mysql-test/t/rpl_auto_increment-master.opt > share/mysql-test/t/rpl_auto_increment.test > share/mysql-test/t/rpl_auto_increment_11932.test > -share/mysql-test/t/rpl_chain_temp_table.test > share/mysql-test/t/rpl_change_master.test > share/mysql-test/t/rpl_charset.test > share/mysql-test/t/rpl_commit_after_flush.test > @@ -1034,7 +1025,6 @@ > share/mysql-test/t/rpl_error_ignored_table.test > share/mysql-test/t/rpl_failed_optimize-master.opt > share/mysql-test/t/rpl_failed_optimize.test > -share/mysql-test/t/rpl_failsafe.test > share/mysql-test/t/rpl_flush_log_loop-master.opt > share/mysql-test/t/rpl_flush_log_loop-master.sh > share/mysql-test/t/rpl_flush_log_loop-slave.opt > @@ -1044,7 +1034,6 @@ > share/mysql-test/t/rpl_free_items-slave.opt > share/mysql-test/t/rpl_free_items.test > share/mysql-test/t/rpl_get_lock.test > -share/mysql-test/t/rpl_heap.test > share/mysql-test/t/rpl_ignore_grant-slave.opt > share/mysql-test/t/rpl_ignore_grant.test > share/mysql-test/t/rpl_ignore_revoke-slave.opt > @@ -1177,8 +1166,6 @@ > share/mysql-test/t/sysdate_is_now-master.opt > share/mysql-test/t/sysdate_is_now.test > share/mysql-test/t/system_mysql_db.test > -share/mysql-test/t/system_mysql_db_fix-master.opt > -share/mysql-test/t/system_mysql_db_fix.test > share/mysql-test/t/system_mysql_db_refs.test > share/mysql-test/t/tablelock.test > share/mysql-test/t/temp_table-master.opt Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
