Update to MySQL 5.1.68.

ok giovanni@
This commit is contained in:
brad 2013-02-08 15:51:56 +00:00
parent 009bdc57c9
commit 0d6f4f57ca
8 changed files with 30 additions and 28 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.210 2012/12/28 02:03:58 brad Exp $
# $OpenBSD: Makefile,v 1.211 2013/02/08 15:51:56 brad 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.67
VERSION= 5.1.68
DISTNAME= mysql-${VERSION}
PKGNAME-main= mysql-client-${VERSION}
PKGNAME-server= mysql-server-${VERSION}

View File

@ -1,2 +1,2 @@
SHA256 (mysql-5.1.67.tar.gz) = il+gKm2w/RZ5dMX8RAGuBcaYLlMx2TVUokGj7i29pAY=
SIZE (mysql-5.1.67.tar.gz) = 24781885
SHA256 (mysql-5.1.68.tar.gz) = JfAoaN3tJKRq7aeGMAi82WOcCPtaMaE34ZU0YpxltRc=
SIZE (mysql-5.1.68.tar.gz) = 24655564

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.34 2011/09/05 07:11:23 giovanni Exp $
--- configure.in.orig Fri Jul 1 11:22:18 2011
+++ configure.in Thu Aug 25 21:46:08 2011
@@ -464,44 +464,7 @@ AC_SUBST(ABI_CHECK)
$OpenBSD: patch-configure_in,v 1.35 2013/02/08 15:51:56 brad Exp $
--- configure.in.orig Tue Jan 8 07:37:00 2013
+++ configure.in Thu Feb 7 12:33:05 2013
@@ -489,44 +489,7 @@ AC_SUBST(ABI_CHECK)
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.34 2011/09/05 07:11:23 giovanni Exp $
AC_SUBST(FIND_PROC)
AC_MSG_RESULT("$FIND_PROC")
@@ -888,7 +851,8 @@ AC_ARG_WITH(libwrap,
@@ -913,7 +876,8 @@ AC_ARG_WITH(libwrap,
AC_CHECK_HEADER(tcpd.h,
LIBS="-lwrap $LIBS"
AC_MSG_CHECKING(for TCP wrappers library -lwrap)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mysql-test_Makefile_in,v 1.26 2011/09/05 07:11:23 giovanni Exp $
--- mysql-test/Makefile.in.orig Tue Apr 12 14:14:51 2011
+++ mysql-test/Makefile.in Thu Jun 30 10:57:33 2011
@@ -399,7 +399,7 @@ yassl_libs = @yassl_libs@
$OpenBSD: patch-mysql-test_Makefile_in,v 1.27 2013/02/08 15:51:56 brad Exp $
--- mysql-test/Makefile.in.orig Tue Jan 8 07:38:38 2013
+++ mysql-test/Makefile.in Thu Feb 7 12:33:06 2013
@@ -400,7 +400,7 @@ yassl_libs = @yassl_libs@
yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
yassl_thread_cxxflags = @yassl_thread_cxxflags@
zlib_dir = @zlib_dir@

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mysql-test_lib_My_SafeProcess_Makefile_in,v 1.6 2012/03/26 08:05:01 giovanni Exp $
--- mysql-test/lib/My/SafeProcess/Makefile.in.orig Fri Dec 16 20:07:28 2011
+++ mysql-test/lib/My/SafeProcess/Makefile.in Wed Mar 21 09:20:44 2012
@@ -396,7 +396,7 @@ yassl_libs = @yassl_libs@
$OpenBSD: patch-mysql-test_lib_My_SafeProcess_Makefile_in,v 1.7 2013/02/08 15:51:56 brad Exp $
--- mysql-test/lib/My/SafeProcess/Makefile.in.orig Tue Jan 8 07:38:38 2013
+++ mysql-test/lib/My/SafeProcess/Makefile.in Thu Feb 7 12:33:06 2013
@@ -397,7 +397,7 @@ yassl_libs = @yassl_libs@
yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
yassl_thread_cxxflags = @yassl_thread_cxxflags@
zlib_dir = @zlib_dir@

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sql-bench_Makefile_in,v 1.5 2010/12/26 08:23:17 ajacoutot Exp $
--- sql-bench/Makefile.in.orig Mon Nov 29 05:42:33 2010
+++ sql-bench/Makefile.in Tue Dec 14 20:38:01 2010
@@ -380,7 +380,7 @@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_
$OpenBSD: patch-sql-bench_Makefile_in,v 1.6 2013/02/08 15:51:56 brad Exp $
--- sql-bench/Makefile.in.orig Tue Jan 8 07:38:39 2013
+++ sql-bench/Makefile.in Thu Feb 7 12:33:06 2013
@@ -381,7 +381,7 @@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_
yassl_thread_cxxflags = @yassl_thread_cxxflags@
zlib_dir = @zlib_dir@
benchdir_root = $(prefix)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sql_mysqld_cc,v 1.28 2012/12/28 02:03:58 brad Exp $
--- sql/mysqld.cc.orig Thu Dec 13 05:05:51 2012
+++ sql/mysqld.cc Tue Dec 25 02:04:51 2012
@@ -4300,7 +4300,7 @@ int main(int argc, char **argv)
$OpenBSD: patch-sql_mysqld_cc,v 1.29 2013/02/08 15:51:56 brad Exp $
--- sql/mysqld.cc.orig Tue Jan 8 07:37:00 2013
+++ sql/mysqld.cc Thu Feb 7 12:32:44 2013
@@ -4299,7 +4299,7 @@ int main(int argc, char **argv)
select_thread_in_use=1;
#ifdef HAVE_LIBWRAP

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-tests,v 1.53 2012/12/28 02:03:58 brad Exp $
@comment $OpenBSD: PLIST-tests,v 1.54 2013/02/08 15:51:56 brad Exp $
@man man/man1/mysql-stress-test.pl.1
@man man/man1/mysql-test-run.pl.1
@man man/man1/mysql_client_test.1
@ -233,7 +233,6 @@ share/mysql-test/include/endspace.inc
share/mysql-test/include/file_does_not_exist.inc
share/mysql-test/include/force_restart.inc
share/mysql-test/include/force_restart_if_skipped.inc
share/mysql-test/include/get_binlog_dump_thread_id.inc
share/mysql-test/include/get_relay_log_pos.inc
share/mysql-test/include/gis_generic.inc
share/mysql-test/include/gis_keys.inc
@ -469,7 +468,6 @@ share/mysql-test/lib/My/SafeProcess/
share/mysql-test/lib/My/SafeProcess.pm
share/mysql-test/lib/My/SafeProcess/Base.pm
@bin share/mysql-test/lib/My/SafeProcess/my_safe_process
share/mysql-test/lib/My/SafeProcess/safe_process.pl
share/mysql-test/lib/My/SysInfo.pm
share/mysql-test/lib/My/Test.pm
share/mysql-test/lib/mtr_cases.pm
@ -2740,6 +2738,7 @@ share/mysql-test/suite/innodb/r/innodb_bug12661768.result
share/mysql-test/suite/innodb/r/innodb_bug13510739.result
share/mysql-test/suite/innodb/r/innodb_bug13635833.result
share/mysql-test/suite/innodb/r/innodb_bug14007649.result
share/mysql-test/suite/innodb/r/innodb_bug14676111.result
share/mysql-test/suite/innodb/r/innodb_bug14704286.result
share/mysql-test/suite/innodb/r/innodb_bug21704.result
share/mysql-test/suite/innodb/r/innodb_bug30423.result
@ -2805,6 +2804,7 @@ share/mysql-test/suite/innodb/t/innodb_bug12661768.test
share/mysql-test/suite/innodb/t/innodb_bug13510739.test
share/mysql-test/suite/innodb/t/innodb_bug13635833.test
share/mysql-test/suite/innodb/t/innodb_bug14007649.test
share/mysql-test/suite/innodb/t/innodb_bug14676111.test
share/mysql-test/suite/innodb/t/innodb_bug14704286.test
share/mysql-test/suite/innodb/t/innodb_bug21704.test
share/mysql-test/suite/innodb/t/innodb_bug30423.test
@ -2892,6 +2892,7 @@ share/mysql-test/suite/innodb_plugin/r/innodb_bug12400341.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug13510739.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug13635833.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug14007649.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug14676111.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug21704.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug30423.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug30919.result
@ -2991,6 +2992,7 @@ share/mysql-test/suite/innodb_plugin/t/innodb_bug12400341.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug13510739.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug13635833.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug14007649.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug14676111.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug21704.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug30423.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug30919-master.opt