Update to MySQL 5.1.67.

ok giovanni@
This commit is contained in:
brad 2012-12-28 02:03:58 +00:00
parent 75b26a8422
commit 9ca5ec64fa
5 changed files with 32 additions and 30 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.209 2012/10/01 09:44:51 giovanni Exp $
# $OpenBSD: Makefile,v 1.210 2012/12/28 02:03:58 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.66
VERSION= 5.1.67
DISTNAME= mysql-${VERSION}
PKGNAME-main= mysql-client-${VERSION}
PKGNAME-server= mysql-server-${VERSION}

View File

@ -1,2 +1,2 @@
SHA256 (mysql-5.1.66.tar.gz) = 64Xj+hUpSWcPW29Deb0dcApfRyZmDOGP8MpigZDLqQc=
SIZE (mysql-5.1.66.tar.gz) = 24771341
SHA256 (mysql-5.1.67.tar.gz) = il+gKm2w/RZ5dMX8RAGuBcaYLlMx2TVUokGj7i29pAY=
SIZE (mysql-5.1.67.tar.gz) = 24781885

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_mysqld_safe_sh,v 1.14 2010/05/24 20:40:41 sthen Exp $
--- scripts/mysqld_safe.sh.orig Thu May 6 11:26:32 2010
+++ scripts/mysqld_safe.sh Thu May 20 20:22:17 2010
$OpenBSD: patch-scripts_mysqld_safe_sh,v 1.15 2012/12/28 02:03:58 brad Exp $
--- scripts/mysqld_safe.sh.orig Thu Dec 13 05:05:51 2012
+++ scripts/mysqld_safe.sh Tue Dec 25 02:04:51 2012
@@ -18,7 +18,8 @@ niceness=0
logging=init
want_syslog=0
@ -11,7 +11,7 @@ $OpenBSD: patch-scripts_mysqld_safe_sh,v 1.14 2010/05/24 20:40:41 sthen Exp $
pid_file=
err_log=
@@ -412,8 +413,8 @@ mysql_unix_port_dir=`dirname $safe_mysql_unix_port`
@@ -439,8 +440,8 @@ mysql_unix_port_dir=`dirname $safe_mysql_unix_port`
if [ ! -d $mysql_unix_port_dir ]
then
mkdir $mysql_unix_port_dir
@ -22,7 +22,7 @@ $OpenBSD: patch-scripts_mysqld_safe_sh,v 1.14 2010/05/24 20:40:41 sthen Exp $
fi
# If the user doesn't specify a binary, we assume name "mysqld"
@@ -577,35 +578,6 @@ do
@@ -610,35 +611,6 @@ do
break
fi

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sql_mysqld_cc,v 1.27 2012/05/11 14:32:36 giovanni Exp $
--- sql/mysqld.cc.orig Mon Apr 16 02:50:06 2012
+++ sql/mysqld.cc Thu May 10 15:18:41 2012
@@ -4298,7 +4298,7 @@ int main(int argc, char **argv)
$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)
select_thread_in_use=1;
#ifdef HAVE_LIBWRAP

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-tests,v 1.52 2012/10/01 09:44:51 giovanni Exp $
@comment $OpenBSD: PLIST-tests,v 1.53 2012/12/28 02:03:58 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
@ -121,6 +121,7 @@ share/mysql-test/extra/binlog_tests/innodb_stat.test
share/mysql-test/extra/binlog_tests/insert_select-binlog.test
share/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
share/mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test
share/mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc
share/mysql-test/extra/rpl_tests/
share/mysql-test/extra/rpl_tests/rpl_EE_err.test
share/mysql-test/extra/rpl_tests/rpl_auto_increment.test
@ -321,7 +322,6 @@ share/mysql-test/include/mix2_ucs2.inc
share/mysql-test/include/mtr_check.sql
share/mysql-test/include/mtr_warnings.sql
share/mysql-test/include/mysqlbinlog_have_debug.inc
share/mysql-test/include/mysqlbinlog_row_engine.inc
share/mysql-test/include/mysqldump.inc
share/mysql-test/include/mysqlhotcopy.inc
share/mysql-test/include/mysqltest-x.inc
@ -825,15 +825,8 @@ share/mysql-test/r/mysql_cp932.result
share/mysql-test/r/mysql_protocols.result
share/mysql-test/r/mysql_upgrade.result
share/mysql-test/r/mysqladmin.result
share/mysql-test/r/mysqlbinlog-cp932.result
share/mysql-test/r/mysqlbinlog.result
share/mysql-test/r/mysqlbinlog2.result
share/mysql-test/r/mysqlbinlog_base64.result
share/mysql-test/r/mysqlbinlog_row.result
share/mysql-test/r/mysqlbinlog_row_big.result
share/mysql-test/r/mysqlbinlog_row_innodb.result
share/mysql-test/r/mysqlbinlog_row_myisam.result
share/mysql-test/r/mysqlbinlog_row_trans.result
share/mysql-test/r/mysqlcheck.result
share/mysql-test/r/mysqldump-compat.result
share/mysql-test/r/mysqldump-max.result
@ -1245,6 +1238,13 @@ share/mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result
share/mysql-test/suite/binlog/r/binlog_mixed_failure_mixing_engines.result
share/mysql-test/suite/binlog/r/binlog_mixed_load_data.result
share/mysql-test/suite/binlog/r/binlog_multi_engine.result
share/mysql-test/suite/binlog/r/binlog_mysqlbinlog-cp932.result
share/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result
share/mysql-test/suite/binlog/r/binlog_mysqlbinlog_base64.result
share/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result
share/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
share/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
share/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result
share/mysql-test/suite/binlog/r/binlog_old_versions.result
share/mysql-test/suite/binlog/r/binlog_query_filter_rules.result
share/mysql-test/suite/binlog/r/binlog_reset_master.result
@ -1314,6 +1314,14 @@ share/mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test
share/mysql-test/suite/binlog/t/binlog_mixed_failure_mixing_engines.test
share/mysql-test/suite/binlog/t/binlog_mixed_load_data.test
share/mysql-test/suite/binlog/t/binlog_multi_engine.test
share/mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932-master.opt
share/mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932.test
share/mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test
share/mysql-test/suite/binlog/t/binlog_mysqlbinlog_base64.test
share/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row.test
share/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test
share/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test
share/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_trans.test
share/mysql-test/suite/binlog/t/binlog_old_versions.test
share/mysql-test/suite/binlog/t/binlog_query_filter_rules-master.opt
share/mysql-test/suite/binlog/t/binlog_query_filter_rules.test
@ -2732,6 +2740,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_bug14704286.result
share/mysql-test/suite/innodb/r/innodb_bug21704.result
share/mysql-test/suite/innodb/r/innodb_bug30423.result
share/mysql-test/suite/innodb/r/innodb_bug30919.result
@ -2796,6 +2805,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_bug14704286.test
share/mysql-test/suite/innodb/t/innodb_bug21704.test
share/mysql-test/suite/innodb/t/innodb_bug30423.test
share/mysql-test/suite/innodb/t/innodb_bug30919-master.opt
@ -4848,17 +4858,9 @@ share/mysql-test/t/mysql_delimiter_source.sql
share/mysql-test/t/mysql_protocols.test
share/mysql-test/t/mysql_upgrade.test
share/mysql-test/t/mysqladmin.test
share/mysql-test/t/mysqlbinlog-cp932-master.opt
share/mysql-test/t/mysqlbinlog-cp932.test
share/mysql-test/t/mysqlbinlog-master.opt
share/mysql-test/t/mysqlbinlog.test
share/mysql-test/t/mysqlbinlog2.test
share/mysql-test/t/mysqlbinlog_base64.test
share/mysql-test/t/mysqlbinlog_row.test
share/mysql-test/t/mysqlbinlog_row_big.test
share/mysql-test/t/mysqlbinlog_row_innodb.test
share/mysql-test/t/mysqlbinlog_row_myisam.test
share/mysql-test/t/mysqlbinlog_row_trans.test
share/mysql-test/t/mysqlcheck.test
share/mysql-test/t/mysqldump-compat.opt
share/mysql-test/t/mysqldump-compat.test