cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 5.1.63

Browse Source 
from Brad (Maintainer)
ok ajacoutot@
This commit is contained in:
giovanni 2012-05-11 14:32:36 +00:00
parent eb99f54925
commit 60f907639b
6 changed files with 26 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
databases/mysql/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.205 2012/05/04 07:57:17 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.206 2012/05/11 14:32:36 giovanni 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.62
VERSION= 5.1.63
DISTNAME= mysql-${VERSION}
PKGNAME-main= mysql-client-${VERSION}
PKGNAME-server= mysql-server-${VERSION}
@ -15,9 +15,6 @@ CATEGORIES= databases
V= MySQL-5.1
MASTER_SITES= ${MASTER_SITE_MYSQL:=Downloads/$V/}
REVISION-main= 1
REVISION-server=1
SHARED_LIBS= mysqlclient_r 21.0 \
mysqlclient 21.0
@ -34,7 +31,7 @@ WANTLIB= c m pthread
LOCALSTATEDIR= ${BASELOCALSTATEDIR}/mysql
SOCKET_DIR= /var/run/mysql
SUBST_VARS= LOCALSTATEDIR SOCKET_DIR VERSION
SUBST_VARS= SOCKET_DIR
MULTI_PACKAGES= -main -server -tests

10
databases/mysql/distinfo
View File

@ -1,5 +1,5 @@
MD5 (mysql-5.1.62.tar.gz) = WIQ6wE0+i7b/lzk45+iKKA==
RMD160 (mysql-5.1.62.tar.gz) = xXIN7uKwSkCiD1ajswWzf+yzQ/4=
SHA1 (mysql-5.1.62.tar.gz) = BsezdC8h/ub69GIk3iIhIw+UP2M=
SHA256 (mysql-5.1.62.tar.gz) = l8B7JHjiWJL+kVssRumQg5c/VB7N8GZyJB8MIvef6tM=
SIZE (mysql-5.1.62.tar.gz) = 24503313
MD5 (mysql-5.1.63.tar.gz) = ZyFnw/A/lp/rrmbEOFnXbQ==
RMD160 (mysql-5.1.63.tar.gz) = 1emvqx1/3OlZQAN2OYWTtZ//aBQ=
SHA1 (mysql-5.1.63.tar.gz) = zhdDCYtTVAy3XBRNcSmbrOc5iu8=
SHA256 (mysql-5.1.63.tar.gz) = KUYaN5LiJNJ9mMW9fX92G+GW1sIV5ztEQOEVBUifGFc=
SIZE (mysql-5.1.63.tar.gz) = 24517173

8
databases/mysql/patches/patch-sql_mysqld_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sql_mysqld_cc,v 1.26 2012/03/26 08:05:01 giovanni Exp $
--- sql/mysqld.cc.orig Fri Dec 16 20:05:59 2011
+++ sql/mysqld.cc Wed Mar 21 09:20:37 2012
@@ -4302,7 +4302,7 @@ int main(int argc, char **argv)
$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)
select_thread_in_use=1;
#ifdef HAVE_LIBWRAP

15
databases/mysql/patches/patch-sql_password_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-sql_password_c,v 1.1 2012/05/04 07:57:18 ajacoutot Exp $
Fix for security issue. Bug #64884.
--- sql/password.c.orig Thu May 3 16:26:33 2012
+++ sql/password.c Thu May 3 16:27:59 2012
@@ -531,7 +531,7 @@ check_scramble(const char *scramble_arg, const char *m
mysql_sha1_reset(&sha1_context);
mysql_sha1_input(&sha1_context, buf, SHA1_HASH_SIZE);
mysql_sha1_result(&sha1_context, hash_stage2_reassured);
- return memcmp(hash_stage2, hash_stage2_reassured, SHA1_HASH_SIZE);
+ return test(memcmp(hash_stage2, hash_stage2_reassured, SHA1_HASH_SIZE));
}

24
databases/mysql/patches/patch-sql_sql_select_cc
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-sql_sql_select_cc,v 1.1 2012/05/04 07:57:18 ajacoutot Exp $
Fix for security issue. Bug #59387.
--- sql/sql_select.cc.orig Thu May 3 16:30:53 2012
+++ sql/sql_select.cc Thu May 3 16:32:26 2012
@@ -5781,7 +5781,7 @@ static bool create_ref_for_key(JOIN *join, JOIN_TAB *j
*/
do
{
- if (!(~used_tables & keyuse->used_tables))
+ if (!(~used_tables & (keyuse->used_tables & ~OUTER_REF_TABLE_BIT)))
{
if (keyparts == keyuse->keypart &&
!(found_part_ref_or_null & keyuse->optimize))
@@ -5834,7 +5834,7 @@ static bool create_ref_for_key(JOIN *join, JOIN_TAB *j
for (i=0 ; i < keyparts ; keyuse++,i++)
{
while (keyuse->keypart != i ||
- ((~used_tables) & keyuse->used_tables))
+ ((~used_tables) & (keyuse->used_tables & ~OUTER_REF_TABLE_BIT)))
keyuse++; /* Skip other parts */
uint maybe_null= test(keyinfo->key_part[i].null_bit);

16
databases/mysql/pkg/PLIST-tests
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-tests,v 1.49 2012/03/26 08:05:01 giovanni Exp $
@comment $OpenBSD: PLIST-tests,v 1.50 2012/05/11 14:32:36 giovanni Exp $
@man man/man1/mysql-stress-test.pl.1
@man man/man1/mysql-test-run.pl.1
@man man/man1/mysql_client_test.1
@ -881,6 +881,7 @@ share/mysql-test/r/partition_archive.result
share/mysql-test/r/partition_binlog_stmt.result
share/mysql-test/r/partition_blackhole.result
share/mysql-test/r/partition_bug18198.result
share/mysql-test/r/partition_cache.result
share/mysql-test/r/partition_charset.result
share/mysql-test/r/partition_csv.result
share/mysql-test/r/partition_datatype.result
@ -2723,9 +2724,11 @@ share/mysql-test/suite/innodb/r/innodb-ucs2.result
share/mysql-test/suite/innodb/r/innodb.result
share/mysql-test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
share/mysql-test/suite/innodb/r/innodb_bug11754376.result
share/mysql-test/suite/innodb/r/innodb_bug11766634.result
share/mysql-test/suite/innodb/r/innodb_bug12400341.result
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_bug21704.result
share/mysql-test/suite/innodb/r/innodb_bug30423.result
share/mysql-test/suite/innodb/r/innodb_bug30919.result
@ -2783,10 +2786,12 @@ share/mysql-test/suite/innodb/t/innodb.test
share/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
share/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
share/mysql-test/suite/innodb/t/innodb_bug11754376.test
share/mysql-test/suite/innodb/t/innodb_bug11766634.test
share/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt
share/mysql-test/suite/innodb/t/innodb_bug12400341.test
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_bug21704.test
share/mysql-test/suite/innodb/t/innodb_bug30423.test
share/mysql-test/suite/innodb/t/innodb_bug30919-master.opt
@ -2868,8 +2873,10 @@ share/mysql-test/suite/innodb_plugin/r/innodb-zip.result
share/mysql-test/suite/innodb_plugin/r/innodb.result
share/mysql-test/suite/innodb_plugin/r/innodb_autoinc_lock_mode_zero.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug11754376.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug11766634.result
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_bug21704.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug30423.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug30919.result
@ -2962,9 +2969,11 @@ share/mysql-test/suite/innodb_plugin/t/innodb.test
share/mysql-test/suite/innodb_plugin/t/innodb_autoinc_lock_mode_zero-master.opt
share/mysql-test/suite/innodb_plugin/t/innodb_autoinc_lock_mode_zero.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug11754376.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug11766634.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug12400341-master.opt
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_bug21704.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug30423.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug30919-master.opt
@ -3975,6 +3984,7 @@ share/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result
share/mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
share/mysql-test/suite/rpl/r/rpl_stm_multi_query.result
share/mysql-test/suite/rpl/r/rpl_stm_no_op.result
share/mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result
share/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
share/mysql-test/suite/rpl/r/rpl_stm_sql_mode.result
share/mysql-test/suite/rpl/r/rpl_stm_until.result
@ -4316,6 +4326,8 @@ share/mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test
share/mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test
share/mysql-test/suite/rpl/t/rpl_stm_multi_query.test
share/mysql-test/suite/rpl/t/rpl_stm_no_op.test
share/mysql-test/suite/rpl/t/rpl_stm_relay_ign_space-slave.opt
share/mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test
share/mysql-test/suite/rpl/t/rpl_stm_reset_slave.test
share/mysql-test/suite/rpl/t/rpl_stm_sql_mode.test
share/mysql-test/suite/rpl/t/rpl_stm_until.test
@ -4534,7 +4546,6 @@ share/mysql-test/t/bug46760.test
share/mysql-test/t/bug47671-master.opt
share/mysql-test/t/bug47671.test
share/mysql-test/t/bulk_replace.test
share/mysql-test/t/cache_innodb-master.opt
share/mysql-test/t/cache_innodb.test
share/mysql-test/t/case.test
share/mysql-test/t/cast.test
@ -4881,6 +4892,7 @@ share/mysql-test/t/partition_archive.test
share/mysql-test/t/partition_binlog_stmt.test
share/mysql-test/t/partition_blackhole.test
share/mysql-test/t/partition_bug18198.test
share/mysql-test/t/partition_cache.test
share/mysql-test/t/partition_charset.test
share/mysql-test/t/partition_csv.test
share/mysql-test/t/partition_datatype.test