summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2015-04-08 10:38:01 +0000
committeradam <adam@pkgsrc.org>2015-04-08 10:38:01 +0000
commit2f5c73e505ab20793ef8fd854e3d5f4a47273053 (patch)
treed823327b356502d8db5ab8a102c68d51da774f34
parent481b301a7e49c2d39acab69b52068b24a7acd35e (diff)
downloadpkgsrc-2f5c73e505ab20793ef8fd854e3d5f4a47273053.tar.gz
Changes 5.5.43:
* CMake support was updated to handle CMake version 3.1. * The server now includes its version number when it writes the initial “starting” message to the error log, to make it easier to tell which server instance error log output applies to. This value is the same as that available from the version system variable. * Bug fixes.
-rw-r--r--databases/mysql55-client/Makefile.common4
-rw-r--r--databases/mysql55-client/distinfo8
-rw-r--r--databases/mysql55-server/Makefile3
-rw-r--r--databases/mysql55-server/PLIST20
4 files changed, 16 insertions, 19 deletions
diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index cbcf0e9cf49..90296a214e3 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.42 2015/02/07 10:13:59 adam Exp $
+# $NetBSD: Makefile.common,v 1.43 2015/04/08 10:38:01 adam Exp $
#
# used by databases/mysql55-client/Makefile
# used by databases/mysql55-server/Makefile
-DISTNAME= mysql-5.5.42
+DISTNAME= mysql-5.5.43
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/}
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index b5d60a4312c..41a3220ccd6 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.41 2015/02/07 10:13:59 adam Exp $
+$NetBSD: distinfo,v 1.42 2015/04/08 10:38:01 adam Exp $
-SHA1 (mysql-5.5.42.tar.gz) = 29f9c31f3857283c58e5887ea6479faa26a509dd
-RMD160 (mysql-5.5.42.tar.gz) = 6dc47c5a885439a99585a0a8225a8e234a19e12e
-Size (mysql-5.5.42.tar.gz) = 21795431 bytes
+SHA1 (mysql-5.5.43.tar.gz) = ac986973e921d669d3bd5e14d8f35110eb7a3428
+RMD160 (mysql-5.5.43.tar.gz) = 780d539d1aed5e753b91ea70f601b97ef03bfff7
+Size (mysql-5.5.43.tar.gz) = 21784417 bytes
SHA1 (sphinx-2.2.7-release.tar.gz) = dedae28c0deafda90109745230dacbe0dc441e1a
RMD160 (sphinx-2.2.7-release.tar.gz) = d9f0150f6779b43457e30c77be50aa9bc658b03a
Size (sphinx-2.2.7-release.tar.gz) = 2969037 bytes
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 03e6d277d3b..ff6d8b443e5 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2015/03/22 07:44:43 fhajny Exp $
+# $NetBSD: Makefile,v 1.29 2015/04/08 10:38:01 adam Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
-PKGREVISION= 2
COMMENT= MySQL 5, a free SQL database (server)
CONFLICTS= mysql3-server-[0-9]*
diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST
index 8dfa3f00b2d..13a04c490e9 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2015/02/07 10:13:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.35 2015/04/08 10:38:01 adam Exp $
bin/innochecksum
bin/my_print_defaults
bin/myisam_ftdump
@@ -4119,6 +4119,7 @@ share/mysql/test/suite/rpl/r/rpl_sp.result
share/mysql/test/suite/rpl/r/rpl_sp004.result
share/mysql/test/suite/rpl/r/rpl_sp_effects.result
share/mysql/test/suite/rpl/r/rpl_spec_variables.result
+share/mysql/test/suite/rpl/r/rpl_special_charset.result
share/mysql/test/suite/rpl/r/rpl_sporadic_master.result
share/mysql/test/suite/rpl/r/rpl_ssl.result
share/mysql/test/suite/rpl/r/rpl_ssl1.result
@@ -4522,6 +4523,9 @@ share/mysql/test/suite/rpl/t/rpl_sp_effects-slave.opt
share/mysql/test/suite/rpl/t/rpl_sp_effects.test
share/mysql/test/suite/rpl/t/rpl_spec_variables-slave.opt
share/mysql/test/suite/rpl/t/rpl_spec_variables.test
+share/mysql/test/suite/rpl/t/rpl_special_charset-master.opt
+share/mysql/test/suite/rpl/t/rpl_special_charset-slave.opt
+share/mysql/test/suite/rpl/t/rpl_special_charset.test
share/mysql/test/suite/rpl/t/rpl_sporadic_master-master.opt
share/mysql/test/suite/rpl/t/rpl_sporadic_master.test
share/mysql/test/suite/rpl/t/rpl_ssl.test
@@ -4641,8 +4645,6 @@ share/mysql/test/suite/sys_vars/inc/range_alloc_block_size_basic.inc
share/mysql/test/suite/sys_vars/inc/rpl_recovery_rank_basic.inc
share/mysql/test/suite/sys_vars/inc/slave_transaction_retries_basic.inc
share/mysql/test/suite/sys_vars/inc/sort_buffer_size_basic.inc
-share/mysql/test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
-share/mysql/test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc
share/mysql/test/suite/sys_vars/r/all_vars.result
share/mysql/test/suite/sys_vars/r/auto_increment_increment_basic.result
share/mysql/test/suite/sys_vars/r/auto_increment_increment_func.result
@@ -5090,10 +5092,8 @@ share/mysql/test/suite/sys_vars/r/timestamp_func.result
share/mysql/test/suite/sys_vars/r/timestamp_sysdate_is_now_func.result
share/mysql/test/suite/sys_vars/r/tmp_table_size_basic.result
share/mysql/test/suite/sys_vars/r/tmpdir_basic.result
-share/mysql/test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result
-share/mysql/test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result
-share/mysql/test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result
-share/mysql/test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result
+share/mysql/test/suite/sys_vars/r/transaction_alloc_block_size_basic.result
+share/mysql/test/suite/sys_vars/r/transaction_prealloc_size_basic.result
share/mysql/test/suite/sys_vars/r/tx_isolation_basic.result
share/mysql/test/suite/sys_vars/r/tx_isolation_func.result
share/mysql/test/suite/sys_vars/r/unique_checks_basic.result
@@ -5602,10 +5602,8 @@ share/mysql/test/suite/sys_vars/t/timestamp_sysdate_is_now_func-master.opt
share/mysql/test/suite/sys_vars/t/timestamp_sysdate_is_now_func.test
share/mysql/test/suite/sys_vars/t/tmp_table_size_basic.test
share/mysql/test/suite/sys_vars/t/tmpdir_basic.test
-share/mysql/test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test
-share/mysql/test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test
-share/mysql/test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test
-share/mysql/test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test
+share/mysql/test/suite/sys_vars/t/transaction_alloc_block_size_basic.test
+share/mysql/test/suite/sys_vars/t/transaction_prealloc_size_basic.test
share/mysql/test/suite/sys_vars/t/tx_isolation_basic.test
share/mysql/test/suite/sys_vars/t/tx_isolation_func-master.opt
share/mysql/test/suite/sys_vars/t/tx_isolation_func.test