aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.database.mk4
-rw-r--r--Mk/bsd.default-versions.mk2
-rw-r--r--UPDATING22
3 files changed, 25 insertions, 3 deletions
diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk
index 9b03cb8e45d4..426ecf6bda21 100644
--- a/Mk/bsd.database.mk
+++ b/Mk/bsd.database.mk
@@ -17,10 +17,10 @@ Database_Include_MAINTAINER= ports@FreeBSD.org
# If no version is given (by the maintainer via the port or
# by the user via defined variable), try to find the
# currently installed version. Fall back to default if
-# necessary (MySQL-5.5 = 55).
+# necessary (MySQL-5.6 = 56).
# DEFAULT_MYSQL_VER
# - MySQL default version. Can be overridden within a port.
-# Default: 55.
+# Default: 56.
# WANT_MYSQL_VER
# - Maintainer can set an arbitrary version of MySQL to always
# build this port with (overrides WITH_MYSQL_VER).
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index a88b4eba9498..d8ac964de294 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -22,7 +22,7 @@ APACHE_DEFAULT?= 2.4
FPC_DEFAULT?= 2.6.4
GCC_DEFAULT?= 4.8
LUA_DEFAULT?= 5.2
-MYSQL_DEFAULT?= 5.5
+MYSQL_DEFAULT?= 5.6
PERL5_DEFAULT?= 5.18
PGSQL_DEFAULT?= 9.3
PHP_DEFAULT?= 5.4
diff --git a/UPDATING b/UPDATING
index e427522c5dbc..499220eb5342 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,28 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20150204:
+ AFFECTS: users of databases/mysql55-(server|client)
+ AUTHOR: ale@FreeBSD.org
+
+ The default MySQL version has been updated from 5.5 to 5.6.
+
+ If you compile your own ports you may keep 5.5 as the default version by
+ adding the following lines to your /etc/make.conf file:
+
+ #
+ # Keep MySQL 5.5 as default version
+ #
+ DEFAULT_VERSIONS+=mysql= 5.5
+
+ If you wish to update to the new default version, you need to first stop any
+ running server instance. Then, you will need to follow these steps, depending
+ on intalled packages.
+
+ # pkg set -o databases/mysql55-client:databases/mysql56-client
+ # pkg set -o databases/mysql55-server:databases/mysql56-server
+ # pkg upgrade
+
20150118:
AFFECTS: users of www/thttpd
AUTHOR: danfe@FreeBSD.org