summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql55-client/Makefile.common4
-rw-r--r--databases/mysql55-client/distinfo10
-rw-r--r--databases/mysql55-server/PLIST13
3 files changed, 19 insertions, 8 deletions
diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index d383196bdc8..5298384920a 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.49 2016/02/25 11:46:21 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.50 2016/02/27 13:41:53 adam Exp $
#
# used by databases/mysql55-client/Makefile
# used by databases/mysql55-server/Makefile
-DISTNAME= mysql-5.5.47
+DISTNAME= mysql-5.5.48
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/}
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index 55e10ab770f..e65876b454e 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.47 2015/12/07 15:54:31 adam Exp $
+$NetBSD: distinfo,v 1.48 2016/02/27 13:41:53 adam Exp $
-SHA1 (mysql-5.5.47.tar.gz) = bf13eb8130bdee223876555f11d5f9d6b1a13270
-RMD160 (mysql-5.5.47.tar.gz) = f337843d60a6121ef388a36ce4a84c2d55e339e3
-SHA512 (mysql-5.5.47.tar.gz) = 807d140764ec18f4a7edb8de3ceff24b2003f1b30cf59cce315b6c1f2475a3f3f92bf369e9fe5704611dd45ee5fb676c0c187851230dcb419adde22436678ce3
-Size (mysql-5.5.47.tar.gz) = 21187802 bytes
+SHA1 (mysql-5.5.48.tar.gz) = ddda6ef8b53b417e715b317ccce40b3234d4789b
+RMD160 (mysql-5.5.48.tar.gz) = 3d9a0c217139ca2a6f4872e645de1e212fafecc7
+SHA512 (mysql-5.5.48.tar.gz) = ac13cdfd89dea70f9ffb443affd5b9abf9984c5ea126b58d7833568e985478a667b73b1c9a4c8c80d80ce8da53168ee720191829ed035cff3f9482f58b5510e4
+Size (mysql-5.5.48.tar.gz) = 21201193 bytes
SHA1 (sphinx-2.2.10-release.tar.gz) = 0f2372dd41df2848ea06c6076a86af6f0f66a071
RMD160 (sphinx-2.2.10-release.tar.gz) = 2712e8ce85609e78c53bd2d9fba877f1e630d5f2
SHA512 (sphinx-2.2.10-release.tar.gz) = 07683f64df730368563e11a7d2939b521837c9a04944ab7d6d09732ab06e451b674169eca4f85db2aae41d883bd16fb4d17b9265912fea9691d07d407d7212d8
diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST
index 01db82d4a2d..cac39e90f8a 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2015/12/07 15:54:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.40 2016/02/27 13:41:53 adam Exp $
bin/innochecksum
bin/my_print_defaults
bin/myisam_ftdump
@@ -1344,6 +1344,7 @@ share/mysql/test/std_data/bug48449.frm
share/mysql/test/std_data/bug49823.CSM
share/mysql/test/std_data/bug49823.CSV
share/mysql/test/std_data/bug49823.frm
+share/mysql/test/std_data/ca-cert-verify.pem
share/mysql/test/std_data/cacert.pem
share/mysql/test/std_data/charset_utf8.txt
share/mysql/test/std_data/checkDBI_DBD-mysql.pl
@@ -1450,7 +1451,11 @@ share/mysql/test/std_data/rpl_loaddata2.dat
share/mysql/test/std_data/rpl_mixed.dat
share/mysql/test/std_data/rpl_timezone.dat
share/mysql/test/std_data/rpl_timezone2.dat
+share/mysql/test/std_data/server-cert-verify-fail.pem
+share/mysql/test/std_data/server-cert-verify-pass.pem
share/mysql/test/std_data/server-cert.pem
+share/mysql/test/std_data/server-key-verify-fail.pem
+share/mysql/test/std_data/server-key-verify-pass.pem
share/mysql/test/std_data/server-key.pem
share/mysql/test/std_data/server8k-cert.pem
share/mysql/test/std_data/server8k-key.pem
@@ -1460,6 +1465,8 @@ share/mysql/test/std_data/vchar.frm
share/mysql/test/std_data/warnings_loaddata.dat
share/mysql/test/std_data/words.dat
share/mysql/test/std_data/words2.dat
+share/mysql/test/suite/auth_sec/r/cert_verify.result
+share/mysql/test/suite/auth_sec/t/cert_verify.test
share/mysql/test/suite/binlog/combinations
share/mysql/test/suite/binlog/r/binlog_base64_flag.result
share/mysql/test/suite/binlog/r/binlog_bug23533.result
@@ -3887,6 +3894,7 @@ share/mysql/test/suite/rpl/r/rpl_auto_increment_11932.result
share/mysql/test/suite/rpl/r/rpl_auto_increment_bug33029.result
share/mysql/test/suite/rpl/r/rpl_auto_increment_bug45679.result
share/mysql/test/suite/rpl/r/rpl_auto_increment_update_failure.result
+share/mysql/test/suite/rpl/r/rpl_autogen_query_multi_byte_char.result
share/mysql/test/suite/rpl/r/rpl_begin_commit_rollback.result
share/mysql/test/suite/rpl/r/rpl_binlog_corruption.result
share/mysql/test/suite/rpl/r/rpl_binlog_errors.result
@@ -4173,6 +4181,7 @@ share/mysql/test/suite/rpl/r/rpl_truncate_3innodb.result
share/mysql/test/suite/rpl/r/rpl_typeconv.result
share/mysql/test/suite/rpl/r/rpl_typeconv_innodb.result
share/mysql/test/suite/rpl/r/rpl_udf.result
+share/mysql/test/suite/rpl/r/rpl_unsafe_statements.result
share/mysql/test/suite/rpl/r/rpl_user.result
share/mysql/test/suite/rpl/r/rpl_user_variables.result
share/mysql/test/suite/rpl/r/rpl_variables.result
@@ -4197,6 +4206,7 @@ share/mysql/test/suite/rpl/t/rpl_auto_increment_11932.test
share/mysql/test/suite/rpl/t/rpl_auto_increment_bug33029.test
share/mysql/test/suite/rpl/t/rpl_auto_increment_bug45679.test
share/mysql/test/suite/rpl/t/rpl_auto_increment_update_failure.test
+share/mysql/test/suite/rpl/t/rpl_autogen_query_multi_byte_char.test
share/mysql/test/suite/rpl/t/rpl_begin_commit_rollback-master.opt
share/mysql/test/suite/rpl/t/rpl_begin_commit_rollback-slave.opt
share/mysql/test/suite/rpl/t/rpl_begin_commit_rollback.test
@@ -4595,6 +4605,7 @@ share/mysql/test/suite/rpl/t/rpl_typeconv_innodb.test
share/mysql/test/suite/rpl/t/rpl_udf-master.opt
share/mysql/test/suite/rpl/t/rpl_udf-slave.opt
share/mysql/test/suite/rpl/t/rpl_udf.test
+share/mysql/test/suite/rpl/t/rpl_unsafe_statements.test
share/mysql/test/suite/rpl/t/rpl_user.test
share/mysql/test/suite/rpl/t/rpl_user_variables.test
share/mysql/test/suite/rpl/t/rpl_variables.test