From f910c3f12f646d17b099112e495136a08c0b02f9 Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Tue, 4 Jun 2013 13:31:21 +0000
Subject: Changes 5.5.32: * mysql_upgrade now verifies that the server version
 matches the version against which it was compiled, and exits if there is a
 mismatch. In addiion, a --version-check option permits specifying whether to
 enable version checking (the default), or disable checking if given as
 --skip-version-checking. * Bugs Fixed

---
 databases/mysql55-server/Makefile | 5 +++--
 databases/mysql55-server/PLIST    | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'databases/mysql55-server')

diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index e7b41fb434b..cabfbd3afe6 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2013/05/20 19:33:54 fhajny Exp $
+# $NetBSD: Makefile,v 1.12 2013/06/04 13:31:21 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 SVR4_PKGNAME=	mysqs
 COMMENT=	MySQL 5, a free SQL database (server)
 
@@ -58,11 +57,13 @@ REPLACE_PERL+=		mysql-test/lib/My/SafeProcess/safe_process.pl
 REPLACE_PERL+=		mysql-test/lib/v1/mysql-test-run.pl
 REPLACE_PERL+=		mysql-test/mysql-stress-test.pl
 REPLACE_PERL+=		mysql-test/mysql-test-run.pl
+REPLACE_PERL+=		mysql-test/std_data/checkDBI_DBD-mysql.pl
 REPLACE_PERL+=		mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl
 REPLACE_PERL+=		mysql-test/suite/funcs_1/lib/DataGen_local.pl
 REPLACE_PERL+=		mysql-test/suite/funcs_1/lib/DataGen_modify.pl
 REPLACE_PERL+=		mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
 REPLACE_PERL+=		mysql-test/mtr
+REPLACE_PERL+=		sql-bench/*.sh
 
 INSTALLATION_DIRS=	bin
 
diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST
index f29832c5299..6472f767e91 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2013/04/20 08:06:56 adam Exp $
+@comment $NetBSD: PLIST,v 1.23 2013/06/04 13:31:21 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -103,6 +103,7 @@ share/mysql/romanian/errmsg.sys
 share/mysql/russian/errmsg.sys
 share/mysql/serbian/errmsg.sys
 share/mysql/slovak/errmsg.sys
+share/mysql/solaris/postinstall-solaris
 share/mysql/spanish/errmsg.sys
 share/mysql/sql-bench/sql-bench/Data/ATIS/aircraft.txt
 share/mysql/sql-bench/sql-bench/Data/ATIS/airline.txt
@@ -443,6 +444,7 @@ share/mysql/test/include/index_merge_ror_cpk.inc
 share/mysql/test/include/innodb-index.inc
 share/mysql/test/include/innodb_rollback_on_timeout.inc
 share/mysql/test/include/innodb_trx_weight.inc
+share/mysql/test/include/install_semisync.inc
 share/mysql/test/include/io_thd_fault_injection.inc
 share/mysql/test/include/ipv6.inc
 share/mysql/test/include/ipv6_clients.inc
@@ -578,6 +580,7 @@ share/mysql/test/include/testdb_only.inc
 share/mysql/test/include/tpcb.inc
 share/mysql/test/include/tpcb_disk_data.inc
 share/mysql/test/include/truncate_file.inc
+share/mysql/test/include/uninstall_semisync.inc
 share/mysql/test/include/unsafe_binlog.inc
 share/mysql/test/include/uses_vardir.inc
 share/mysql/test/include/varchar.inc
-- 
cgit v1.2.3