summaryrefslogtreecommitdiff
path: root/databases/mysql80-server/files/patch-cmake_install_layout.cmake
diff options
context:
space:
mode:
authorJochen Neumeister <joneum@FreeBSD.org>2020-05-07 11:51:14 +0000
committerJochen Neumeister <joneum@FreeBSD.org>2020-05-07 11:51:14 +0000
commit19679c5f4eb778f347f83329cf05bdfe80b514d7 (patch)
tree75b4ddda778451082eb98cf3eeea6644dd5d9882 /databases/mysql80-server/files/patch-cmake_install_layout.cmake
parentUpdate to 2020.1.1 (diff)
databases/mysql80-{client, server}: Update to latest release 8.0.20
- Performance: Certain queries against tables with spatial indexes were not performed as efficiently following an upgrade from MySQL 5.7 to MySQL 8.0. - NDB Cluster: NDB defines one SPJ worker per node owning a primary partition of the root table. If this table used read from any replica, DBTC put all SPJ workers in the same DBSPJ instance, which effe - NDB Cluster: Executing the SHOW command using an ndb_mgm client binary from NDB 8.0.16 or earlier to access a management node running NDB 8.0.17 or later produced the error message Unknown field: is_s - On EL7 and EL8, CMake configuration was adjusted to look for GCC 9 before GCC 8. Because libmysqlclient ships with MySQL distributions, client applications built against libmysqlclient on those platfo - The max_length_for_sort_data system variable is now deprecated due to optimizer changes that make it obsolete and of no effect. More Infos: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-20.html Special thanks to: fluffy MFH: 2020Q2 Security: 21d59ea3-8559-11ea-a5e2-d4c9ef517024 (MySQL - Server) Security: 622b5c47-855b-11ea-a5e2-d4c9ef517024 (MySQL - Client) Sponsored by: Netzkommune GmbH
Notes
Notes: svn path=/head/; revision=534263
Diffstat (limited to 'databases/mysql80-server/files/patch-cmake_install_layout.cmake')
-rw-r--r--databases/mysql80-server/files/patch-cmake_install_layout.cmake32
1 files changed, 14 insertions, 18 deletions
diff --git a/databases/mysql80-server/files/patch-cmake_install_layout.cmake b/databases/mysql80-server/files/patch-cmake_install_layout.cmake
index 854763abb009..d9d06a66f44e 100644
--- a/databases/mysql80-server/files/patch-cmake_install_layout.cmake
+++ b/databases/mysql80-server/files/patch-cmake_install_layout.cmake
@@ -29,7 +29,7 @@
LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
IF(ind EQUAL -1)
MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
-@@ -159,6 +163,32 @@ SET(INSTALL_MYSQLKEYRINGDIR_STANDALONE "keyring")
+@@ -171,6 +175,32 @@ SET(INSTALL_MYSQLKEYRINGDIR_STANDALONE "keyring")
SET(INSTALL_SECURE_FILE_PRIVDIR_STANDALONE ${secure_file_priv_path})
#
@@ -62,28 +62,20 @@
# TARGZ layout
#
SET(INSTALL_BINDIR_TARGZ "bin")
-@@ -345,7 +375,7 @@ ENDIF()
-
- # Install layout for router, follows the same pattern as above.
- #
--# Supported layouts here are STANDALONE, RPM, DEB, SVR4, TARGZ
-+# Supported layouts here are STANDALONE, FREEBSD, RPM, DEB, SVR4, TARGZ
-
- # Variables ROUTER_INSTALL_${X}DIR, where
- # X = BIN, LIB and DOC is using
-@@ -387,7 +417,7 @@ ENDIF()
+@@ -369,7 +399,7 @@ ENDIF()
SET(ROUTER_INSTALL_LAYOUT "${DEFAULT_ROUTER_INSTALL_LAYOUT}"
CACHE
STRING
- "Installation directory layout. Options are: STANDALONE RPM DEB SVR4 TARGZ")
+ "Installation directory layout. Options are: STANDALONE FREEBSD RPM DEB SVR4 TARGZ")
- # If are _pure_ STANDALONE we can write into data/ as it is all ours
- # if we are shared STANDALONE with the the server, we shouldn't write
-@@ -400,6 +430,13 @@ SET(ROUTER_INSTALL_CONFIGDIR_STANDALONE ".")
- SET(ROUTER_INSTALL_DATADIR_STANDALONE "var/lib/mysqlrouter")
- SET(ROUTER_INSTALL_LOGDIR_STANDALONE ".")
- SET(ROUTER_INSTALL_RUNTIMEDIR_STANDALONE "run")
+ # If we are shared STANDALONE with the the server, we shouldn't write
+ # into the server's data/ as that would create a "schemadir" in
+@@ -408,6 +438,18 @@ FOREACH(var
+ )
+ SET(ROUTER_INSTALL_${var}DIR_TARGZ ${ROUTER_INSTALL_${var}DIR_STANDALONE})
+ ENDFOREACH()
++
+#
+# FreeBSD layout
+#
@@ -91,6 +83,10 @@
+SET(ROUTER_INSTALL_DATADIR_FREEBSD "/var/db/mysqlrouter")
+SET(ROUTER_INSTALL_LOGDIR_FREEBSD "/var/log/mysqlrouter")
+SET(ROUTER_INSTALL_RUNTIMEDIR_FREEBSD "/var/run/mysqlrouter")
++
++SET(ROUTER_INSTALL_BINDIR_FREEBSD "bin")
++SET(ROUTER_INSTALL_LIBDIR_FREEBSD "lib/mysql")
++SET(ROUTER_INSTALL_PLUGINDIR_FREEBSD "lib/mysql/mysqlrouter")
+
#
# RPM layout
- #