diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2020-05-26 09:58:39 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2020-05-26 09:58:39 +0000 |
| commit | da3ccc48428fd463e97838e7c0e3c8b723886c1c (patch) | |
| tree | 6159c5183d1006f5d7d2a4e12f8a60ed1d66f2c4 /databases/mariadb104-client/files/patch-MDEV-11790 | |
| parent | Update audio/praat to latest upstream release 6.1.15 (20 May 2020) (diff) | |
databases/mariadb104-server: Fix configuration location / overhaul
* Fix configuration location [1]
* Share patches between client and server
* Provide minimal configuration for client and server
* Make the wsrep config a sample only
* Fixup plists
PR: 246694 [1]
Reported by: <theis gmx at>
MFH: 2020Q2
Diffstat (limited to 'databases/mariadb104-client/files/patch-MDEV-11790')
| -rw-r--r-- | databases/mariadb104-client/files/patch-MDEV-11790 | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/databases/mariadb104-client/files/patch-MDEV-11790 b/databases/mariadb104-client/files/patch-MDEV-11790 deleted file mode 100644 index 1794bcf44da7..000000000000 --- a/databases/mariadb104-client/files/patch-MDEV-11790 +++ /dev/null @@ -1,46 +0,0 @@ -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} |