diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2017-05-04 06:46:26 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2017-05-04 06:46:26 +0000 |
| commit | 17218f2228b8dd6e3d3ba54265bbf28ecb6ee399 (patch) | |
| tree | cf86d2e13c46546f6ba36a74763223e673db0444 /databases/mariadb101-client/files/patch-CMakeLists.txt | |
| parent | Fix shebangs (diff) | |
databases/mariadb101-server: Update to 10.1.23
- Security and bugfix update to 10.1.23
- Add upstream patch for InnoDB crash
- Update CMakeLists.txt patch
- Remove MDEV-12261 patch (included upstream)
- Fix plist issues
PR: 219045
Submitted by: Dani <i.dani@outlook.com>
MFH: 2017Q2
Security: d9e01c35-2531-11e7-b291-b499baebfeaf
Notes
Notes:
svn path=/head/; revision=440094
Diffstat (limited to 'databases/mariadb101-client/files/patch-CMakeLists.txt')
| -rw-r--r-- | databases/mariadb101-client/files/patch-CMakeLists.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/databases/mariadb101-client/files/patch-CMakeLists.txt b/databases/mariadb101-client/files/patch-CMakeLists.txt index 285d6128cd3c..052cc744a248 100644 --- a/databases/mariadb101-client/files/patch-CMakeLists.txt +++ b/databases/mariadb101-client/files/patch-CMakeLists.txt @@ -1,22 +1,23 @@ ---- CMakeLists.txt.orig 2016-03-24 09:12:10 UTC +--- CMakeLists.txt.orig 2017-05-02 05:13:38 UTC +++ CMakeLists.txt -@@ -380,7 +380,6 @@ ADD_SUBDIRECTORY(libmysql) +@@ -385,7 +385,7 @@ ADD_SUBDIRECTORY(libmysql) ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) -ADD_SUBDIRECTORY(sql/share) ++#ADD_SUBDIRECTORY(sql/share) IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(tests) -@@ -460,6 +459,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL +@@ -465,6 +465,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +IF(FALSE) - INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty + INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.thirdparty EXCEPTIONS-CLIENT COMPONENT Readme) - # MDEV-6526 these files are not installed anymore -@@ -470,6 +470,7 @@ IF(UNIX) + +@@ -476,6 +477,7 @@ IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) ENDIF() |