summaryrefslogtreecommitdiff
path: root/databases/mariadb103-client/files/patch-MDEV-11790
diff options
context:
space:
mode:
authorBernard Spil <brnrd@FreeBSD.org>2018-10-27 15:06:54 +0000
committerBernard Spil <brnrd@FreeBSD.org>2018-10-27 15:06:54 +0000
commit3c90fd702b974ae9f74e608ff93671847f5de46c (patch)
treef7794d2362eca1b6bb489cee7a083d1aa771ab2d /databases/mariadb103-client/files/patch-MDEV-11790
parentUpdate to 2.2.1 (diff)
databases/mariadb103-server: Fix plist issues
- Resurect mysql_upgrade [1] - Move some files between -client and -server PR: 232735 [1] Reported by: Naram Qashat <cyberbotx cyberbotx com> [1] MFH: 2018Q4
Notes
Notes: svn path=/head/; revision=483143
Diffstat (limited to 'databases/mariadb103-client/files/patch-MDEV-11790')
-rw-r--r--databases/mariadb103-client/files/patch-MDEV-1179046
1 files changed, 46 insertions, 0 deletions
diff --git a/databases/mariadb103-client/files/patch-MDEV-11790 b/databases/mariadb103-client/files/patch-MDEV-11790
new file mode 100644
index 000000000000..1794bcf44da7
--- /dev/null
+++ b/databases/mariadb103-client/files/patch-MDEV-11790
@@ -0,0 +1,46 @@
+WITHOUT_SERVER installs server-only files
+
+https://jira.mariadb.org/browse/MDEV-11790
+--- extra/CMakeLists.txt.orig 2018-10-02 09:45:40 UTC
++++ extra/CMakeLists.txt
+@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
+ ADD_DEPENDENCIES(innochecksum GenError)
+ ENDIF()
+
+-MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
++MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client)
+ TARGET_LINK_LIBRARIES(replace mysys)
+
+ IF(UNIX)
+--- scripts/CMakeLists.txt.orig 2018-10-02 09:45:42 UTC
++++ scripts/CMakeLists.txt
+@@ -241,7 +241,10 @@ ENDIF()
+ SET(mysql_config_COMPONENT COMPONENT Development)
+ SET(msql2mysql_COMPONENT COMPONENT Client)
+ SET(mysqlaccess_COMPONENT COMPONENT Client)
++SET(mysqlhotcopy_COMPONENT COMPONENT Client)
++SET(mysql_convert_table_format_COMPONENT COMPONENT Client)
+ SET(mysql_find_rows_COMPONENT COMPONENT Client)
++SET(mysql_setpermission_COMPONENT COMPONENT Client)
+ SET(mytop_COMPONENT Mytop)
+
+ IF(WIN32)
+@@ -298,14 +301,14 @@ ELSE()
+ # On Unix, most of the files end up in the bin directory
+ SET(BIN_SCRIPTS
+ msql2mysql
+- mysql_config
+- mysql_setpermission
+- mysql_secure_installation
+ mysqlaccess
++ mysqlhotcopy
++ mysql_config
+ mysql_convert_table_format
+ mysql_find_rows
++ mysql_secure_installation
++ mysql_setpermission
+ mytop
+- mysqlhotcopy
+ ${SERVER_SCRIPTS}
+ ${WSREP_SCRIPTS}
+ ${SYSTEMD_SCRIPTS}