From 08e57d4d057d25bf79d67cddccc88f23128f5ccd Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 13 May 2012 13:05:33 +0000 Subject: Update mysql55-{client,server} to 5.55.24. Changes (http://dev.mysql.com/doc/refman/5.5/en/news-5-5-24.html): Functionality Added or Changed * Important Change: Replication: INSERT ON DUPLICATE KEY UPDATE is now marked as unsafe for statement-based replication if the target table has more than one primary or unique key. For more information, see Section 16.1.2.3, "Determination of Safe and Unsafe Statements in Binary Logging". Bugs Fixed * Security Fix: Bug #64884 was fixed. * InnoDB: Replication: When binary log statements were replayed on the slave, the Com_insert, Com_update, and Com_delete counters were incremented by BEGIN statements initiating transactions affecting InnoDB tables but not by COMMIT statements ending such transactions. This affected these statements whether they were replicated or they were run using mysqlbinlog. (Bug #12662190) * If the --bind-address option was given a host name value and the host name resolved to more than one IP address, the server failed to start. For example, with --bind-address=localhost, if localhost resolved to both 127.0.0.1 and ::1, startup failed. Now the server prefers the IPv4 address in such cases. (Bug #61713, Bug #12762885) * mysql_store_result() and mysql_use_result() are not for use with prepared statements and are not intended to be called following mysql_stmt_execute(), but failed to return an error when invoked that way in libmysqld. (Bug #62136, Bug #13738989) References: See also Bug #47485. * On Windows, mysqlslap crashed for attempts to connect using shared memory. (Bug #31173, Bug #11747181, Bug #59107, Bug #11766072) --- databases/mysql55-client/Makefile.common | 4 ++-- databases/mysql55-client/distinfo | 8 ++++---- databases/mysql55-server/PLIST | 9 +++++++-- 3 files changed, 13 insertions(+), 8 deletions(-) (limited to 'databases') diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common index bfdc6f5d82d..36ea63bd116 100644 --- a/databases/mysql55-client/Makefile.common +++ b/databases/mysql55-client/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.17 2012/04/14 12:10:05 adam Exp $ +# $NetBSD: Makefile.common,v 1.18 2012/05/13 13:05:33 taca Exp $ # # used by databases/mysql55-client/Makefile # used by databases/mysql55-server/Makefile -DISTNAME= mysql-5.5.23 +DISTNAME= mysql-5.5.24 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/} diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo index 0c73151f441..8ee8dfad2f9 100644 --- a/databases/mysql55-client/distinfo +++ b/databases/mysql55-client/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.14 2012/04/14 12:10:05 adam Exp $ +$NetBSD: distinfo,v 1.15 2012/05/13 13:05:33 taca Exp $ -SHA1 (mysql-5.5.23.tar.gz) = 4948239625f0c23f033cadce7f41c31a5725ca12 -RMD160 (mysql-5.5.23.tar.gz) = 1c5b086be0b8f5e1f3128c160e1e4814f68dac95 -Size (mysql-5.5.23.tar.gz) = 24485979 bytes +SHA1 (mysql-5.5.24.tar.gz) = 1ab814db770ec373a54c7c0627c694ebac611e85 +RMD160 (mysql-5.5.24.tar.gz) = 8a6cf0ff40d7b21bb9bb2fab82d0695574e6f2f9 +Size (mysql-5.5.24.tar.gz) = 24518874 bytes SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6 SHA1 (patch-CMakeLists.txt) = 5e990e40e1e8a5d558315a38b6596c8fa4227e7b SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST index e64de442476..c19d4ea8e19 100644 --- a/databases/mysql55-server/PLIST +++ b/databases/mysql55-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2012/04/14 12:10:05 adam Exp $ +@comment $NetBSD: PLIST,v 1.16 2012/05/13 13:05:33 taca Exp $ bin/innochecksum bin/my_print_defaults bin/myisam_ftdump @@ -673,6 +673,7 @@ share/mysql/test/r/big_test.require share/mysql/test/r/bigint.result share/mysql/test/r/binary.result share/mysql/test/r/binlog_tx_isolation.result +share/mysql/test/r/blackhole.result share/mysql/test/r/blackhole_plugin.result share/mysql/test/r/bool.result share/mysql/test/r/bootstrap.result @@ -2910,6 +2911,7 @@ 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 @@ -3018,6 +3020,7 @@ 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 @@ -3990,6 +3993,7 @@ share/mysql/test/suite/rpl/r/rpl_row_loaddata_m.result share/mysql/test/suite/rpl/r/rpl_row_log.result share/mysql/test/suite/rpl/r/rpl_row_log_innodb.result share/mysql/test/suite/rpl/r/rpl_row_max_relay_size.result +share/mysql/test/suite/rpl/r/rpl_row_merge_engine.result share/mysql/test/suite/rpl/r/rpl_row_mixing_engines.result share/mysql/test/suite/rpl/r/rpl_row_multi_query.result share/mysql/test/suite/rpl/r/rpl_row_mysqlbinlog.result @@ -4318,7 +4322,6 @@ share/mysql/test/suite/rpl/t/rpl_replicate_ignore_db-slave.opt share/mysql/test/suite/rpl/t/rpl_replicate_ignore_db.test share/mysql/test/suite/rpl/t/rpl_report-slave.opt share/mysql/test/suite/rpl/t/rpl_report.test -share/mysql/test/suite/rpl/t/rpl_report_port-slave.opt share/mysql/test/suite/rpl/t/rpl_report_port.test share/mysql/test/suite/rpl/t/rpl_rewrt_db-slave.opt share/mysql/test/suite/rpl/t/rpl_rewrt_db.test @@ -4367,6 +4370,7 @@ share/mysql/test/suite/rpl/t/rpl_row_log.test share/mysql/test/suite/rpl/t/rpl_row_log_innodb-master.opt share/mysql/test/suite/rpl/t/rpl_row_log_innodb.test share/mysql/test/suite/rpl/t/rpl_row_max_relay_size.test +share/mysql/test/suite/rpl/t/rpl_row_merge_engine.test share/mysql/test/suite/rpl/t/rpl_row_mixing_engines.test share/mysql/test/suite/rpl/t/rpl_row_mysqlbinlog-master.opt share/mysql/test/suite/rpl/t/rpl_row_mysqlbinlog.test @@ -5549,6 +5553,7 @@ share/mysql/test/t/auto_increment.test share/mysql/test/t/bench_count_distinct.test share/mysql/test/t/bigint.test share/mysql/test/t/binary.test +share/mysql/test/t/blackhole.test share/mysql/test/t/blackhole_plugin-master.opt share/mysql/test/t/blackhole_plugin.test share/mysql/test/t/bool.test -- cgit v1.2.3