update to 5.1.38, from Brad (maintainer).

This commit is contained in:
sthen 2009-09-07 21:35:34 +00:00
parent 092e2f8c18
commit a155f5b2db
8 changed files with 79 additions and 32 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.156 2009/08/05 14:24:33 sthen Exp $
# $OpenBSD: Makefile,v 1.157 2009/09/07 21:35:34 sthen Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT-main= multithreaded SQL database (client)
COMMENT-server= multithreaded SQL database (server)
COMMENT-tests= multithreaded SQL database (regression test suite/benchmark)
VERSION= 5.1.37
VERSION= 5.1.38
DISTNAME= mysql-${VERSION}
PKGNAME-main= mysql-client-${VERSION}
PKGNAME-server= mysql-server-${VERSION}

View File

@ -1,5 +1,5 @@
MD5 (mysql-5.1.37.tar.gz) = y9uHg7BTAZdV7pGW9n6gTA==
RMD160 (mysql-5.1.37.tar.gz) = Ex3794v5FqnFDDUmgdJb2Um0yRQ=
SHA1 (mysql-5.1.37.tar.gz) = rD184QYUn+8g6KmQthJPngVSTkk=
SHA256 (mysql-5.1.37.tar.gz) = akWWRi1ER6eaCtYH6hR1ugWZZR4tgjBaf32t4DiCfww=
SIZE (mysql-5.1.37.tar.gz) = 35796850
MD5 (mysql-5.1.38.tar.gz) = jum7gAebvQlJmii8V9kC5w==
RMD160 (mysql-5.1.38.tar.gz) = 8bl5p7w/APG+9noEYv86v4LdX/Y=
SHA1 (mysql-5.1.38.tar.gz) = 2iYw/RbTjnCP3oZNhL3NixNpdx0=
SHA256 (mysql-5.1.38.tar.gz) = xWYmPUM58QXFW2oz23856namuSiEPU7+7PprMRHvfVg=
SIZE (mysql-5.1.38.tar.gz) = 37672923

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-mysql-test_Makefile_in,v 1.21 2009/07/27 15:19:15 sthen Exp $
--- mysql-test/Makefile.in.orig Thu May 14 07:43:38 2009
+++ mysql-test/Makefile.in Mon Jun 8 02:26:03 2009
@@ -397,7 +397,7 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@
$OpenBSD: patch-mysql-test_Makefile_in,v 1.22 2009/09/07 21:35:34 sthen Exp $
--- mysql-test/Makefile.in.orig Fri Aug 21 08:17:20 2009
+++ mysql-test/Makefile.in Mon Sep 7 11:17:05 2009
@@ -399,7 +399,7 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@
yassl_libs = @yassl_libs@
yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
zlib_dir = @zlib_dir@
-testdir = $(prefix)/mysql-test
+testdir = $(datadir)/mysql-test
-testroot = $(prefix)
+testroot = $(datadir)
testdir = $(testroot)/mysql-test
test_SCRIPTS = mtr \
mysql-test-run \
mysql-test-run.pl \

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-mysql-test_lib_My_SafeProcess_Makefile_in,v 1.1 2009/07/27 15:19:15 sthen Exp $
--- mysql-test/lib/My/SafeProcess/Makefile.in.orig Fri Jul 17 21:57:51 2009
+++ mysql-test/lib/My/SafeProcess/Makefile.in Fri Jul 17 21:58:44 2009
@@ -392,7 +392,7 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@
$OpenBSD: patch-mysql-test_lib_My_SafeProcess_Makefile_in,v 1.2 2009/09/07 21:35:34 sthen Exp $
--- mysql-test/lib/My/SafeProcess/Makefile.in.orig Fri Aug 21 08:17:20 2009
+++ mysql-test/lib/My/SafeProcess/Makefile.in Mon Sep 7 11:17:51 2009
@@ -394,7 +394,7 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@
yassl_libs = @yassl_libs@
yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
zlib_dir = @zlib_dir@
-safedir = $(prefix)/mysql-test/lib/My/SafeProcess
+safedir = $(datadir)/mysql-test/lib/My/SafeProcess
-testroot = $(prefix)
+testroot = $(datadir)
safedir = $(testroot)/mysql-test/lib/My/SafeProcess
my_safe_process_SOURCES = safe_process.cc
EXTRA_DIST = safe_kill_win.cc \
safe_process_win.cc \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sql-bench_Makefile_in,v 1.1 2009/07/27 15:19:15 sthen Exp $
--- sql-bench/Makefile.in.orig Thu May 14 07:43:45 2009
+++ sql-bench/Makefile.in Mon Jun 8 02:26:03 2009
@@ -377,7 +377,7 @@ yassl_libs = @yassl_libs@
$OpenBSD: patch-sql-bench_Makefile_in,v 1.2 2009/09/07 21:35:34 sthen Exp $
--- sql-bench/Makefile.in.orig Fri Aug 21 08:17:25 2009
+++ sql-bench/Makefile.in Mon Sep 7 11:10:26 2009
@@ -379,7 +379,7 @@ yassl_libs = @yassl_libs@
yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
zlib_dir = @zlib_dir@
benchdir_root = $(prefix)

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-sql_mysqld_cc,v 1.16 2009/07/27 15:19:15 sthen Exp $
--- sql/mysqld.cc.orig Tue Jun 16 08:29:48 2009
+++ sql/mysqld.cc Wed Jul 1 18:50:55 2009
@@ -4303,7 +4303,7 @@ int main(int argc, char **argv)
init_ssl();
$OpenBSD: patch-sql_mysqld_cc,v 1.17 2009/09/07 21:35:34 sthen Exp $
--- sql/mysqld.cc.orig Fri Aug 21 08:12:26 2009
+++ sql/mysqld.cc Mon Sep 7 11:10:27 2009
@@ -4320,7 +4320,7 @@ int main(int argc, char **argv)
select_thread_in_use=1;
#ifdef HAVE_LIBWRAP
- libwrapName= my_progname+dirname_length(my_progname);

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-server,v 1.31 2009/07/27 15:19:15 sthen Exp $
@comment $OpenBSD: PLIST-server,v 1.32 2009/09/07 21:35:34 sthen Exp $
@newgroup _mysql:502
@newuser _mysql:502:_mysql:daemon:MySQL Account:/nonexistent:/sbin/nologin
@bin bin/innochecksum
@ -36,6 +36,9 @@ lib/mysql/libvio.a
@comment lib/mysql/plugin/ha_example.a
@comment lib/mysql/plugin/ha_example.la
lib/mysql/plugin/ha_example.so.0.0
@comment lib/mysql/plugin/ha_innodb_plugin.a
@comment lib/mysql/plugin/ha_innodb_plugin.la
lib/mysql/plugin/ha_innodb_plugin.so.0.0
@bin libexec/mysqld
@bin libexec/mysqlmanager
@man man/man1/comp_err.1

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-tests,v 1.33 2009/08/05 14:24:33 sthen Exp $
@comment $OpenBSD: PLIST-tests,v 1.34 2009/09/07 21:35:34 sthen Exp $
@man man/man1/mysql-stress-test.pl.1
@man man/man1/mysql-test-run.pl.1
@man man/man1/mysql_client_test.1
@ -135,6 +135,7 @@ share/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
share/mysql-test/extra/rpl_tests/rpl_failed_optimize.test
share/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
share/mysql-test/extra/rpl_tests/rpl_foreign_key.test
share/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
share/mysql-test/extra/rpl_tests/rpl_insert_delayed.test
share/mysql-test/extra/rpl_tests/rpl_insert_id.test
share/mysql-test/extra/rpl_tests/rpl_insert_id_pk.test
@ -456,6 +457,7 @@ share/mysql-test/r/binary.result
share/mysql-test/r/binlog_tx_isolation.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/cache_innodb.result
@ -829,10 +831,12 @@ share/mysql-test/r/partition_list.result
share/mysql-test/r/partition_mgm.result
share/mysql-test/r/partition_mgm_err.result
share/mysql-test/r/partition_mgm_err2.result
share/mysql-test/r/partition_not_embedded.result
share/mysql-test/r/partition_not_windows.result
share/mysql-test/r/partition_order.result
share/mysql-test/r/partition_pruning.result
share/mysql-test/r/partition_range.result
share/mysql-test/r/partition_rename_longfilename.result
share/mysql-test/r/partition_symlink.result
share/mysql-test/r/partition_windows.result
share/mysql-test/r/perror-win.result
@ -1667,6 +1671,40 @@ share/mysql-test/suite/funcs_2/t/memory_charset.test
share/mysql-test/suite/funcs_2/t/myisam_charset.test
share/mysql-test/suite/funcs_2/t/ndb_charset.test
share/mysql-test/suite/funcs_2/t/suite.opt
share/mysql-test/suite/innodb/
share/mysql-test/suite/innodb/include/
share/mysql-test/suite/innodb/include/have_innodb_plugin.inc
share/mysql-test/suite/innodb/include/innodb-index.inc
share/mysql-test/suite/innodb/r/
share/mysql-test/suite/innodb/r/innodb-analyze.result
share/mysql-test/suite/innodb/r/innodb-index.result
share/mysql-test/suite/innodb/r/innodb-index_ucs2.result
share/mysql-test/suite/innodb/r/innodb-timeout.result
share/mysql-test/suite/innodb/r/innodb-use-sys-malloc.result
share/mysql-test/suite/innodb/r/innodb-zip.result
share/mysql-test/suite/innodb/r/innodb_bug36169.result
share/mysql-test/suite/innodb/r/innodb_bug36172.result
share/mysql-test/suite/innodb/r/innodb_bug40360.result
share/mysql-test/suite/innodb/r/innodb_bug41904.result
share/mysql-test/suite/innodb/r/innodb_bug44032.result
share/mysql-test/suite/innodb/r/innodb_file_format.result
share/mysql-test/suite/innodb/r/innodb_information_schema.result
share/mysql-test/suite/innodb/t/
share/mysql-test/suite/innodb/t/disabled.def
share/mysql-test/suite/innodb/t/innodb-analyze.test
share/mysql-test/suite/innodb/t/innodb-index.test
share/mysql-test/suite/innodb/t/innodb-index_ucs2.test
share/mysql-test/suite/innodb/t/innodb-timeout.test
share/mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt
share/mysql-test/suite/innodb/t/innodb-use-sys-malloc.test
share/mysql-test/suite/innodb/t/innodb-zip.test
share/mysql-test/suite/innodb/t/innodb_bug36169.test
share/mysql-test/suite/innodb/t/innodb_bug36172.test
share/mysql-test/suite/innodb/t/innodb_bug40360.test
share/mysql-test/suite/innodb/t/innodb_bug41904.test
share/mysql-test/suite/innodb/t/innodb_bug44032.test
share/mysql-test/suite/innodb/t/innodb_file_format.test
share/mysql-test/suite/innodb/t/innodb_information_schema.test
share/mysql-test/suite/jp/
share/mysql-test/suite/jp/include/
share/mysql-test/suite/jp/include/trim_sjis.inc
@ -2420,6 +2458,7 @@ share/mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result
share/mysql-test/suite/rpl/r/rpl_found_rows.result
share/mysql-test/suite/rpl/r/rpl_free_items.result
share/mysql-test/suite/rpl/r/rpl_get_lock.result
share/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
share/mysql-test/suite/rpl/r/rpl_grant.result
share/mysql-test/suite/rpl/r/rpl_idempotency.result
share/mysql-test/suite/rpl/r/rpl_ignore_grant.result
@ -2675,6 +2714,7 @@ share/mysql-test/suite/rpl/t/rpl_found_rows.test
share/mysql-test/suite/rpl/t/rpl_free_items-slave.opt
share/mysql-test/suite/rpl/t/rpl_free_items.test
share/mysql-test/suite/rpl/t/rpl_get_lock.test
share/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
share/mysql-test/suite/rpl/t/rpl_grant.test
share/mysql-test/suite/rpl/t/rpl_idempotency-slave.opt
share/mysql-test/suite/rpl/t/rpl_idempotency.test
@ -3070,6 +3110,8 @@ share/mysql-test/t/bigint.test
share/mysql-test/t/binary.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
@ -3453,11 +3495,13 @@ share/mysql-test/t/partition_list.test
share/mysql-test/t/partition_mgm.test
share/mysql-test/t/partition_mgm_err.test
share/mysql-test/t/partition_mgm_err2.test
share/mysql-test/t/partition_not_embedded.test
share/mysql-test/t/partition_not_windows-master.opt
share/mysql-test/t/partition_not_windows.test
share/mysql-test/t/partition_order.test
share/mysql-test/t/partition_pruning.test
share/mysql-test/t/partition_range.test
share/mysql-test/t/partition_rename_longfilename.test
share/mysql-test/t/partition_symlink.test
share/mysql-test/t/partition_windows.test
share/mysql-test/t/perror-win.test