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-server/files | |
parent | e3a0ba3652c008ed6b7c99cd6d3b2398e57f4302 (diff) | |
download | ports-17218f2228b8dd6e3d3ba54265bbf28ecb6ee399.tar.gz ports-17218f2228b8dd6e3d3ba54265bbf28ecb6ee399.zip |
Notes
Diffstat (limited to 'databases/mariadb101-server/files')
-rw-r--r-- | databases/mariadb101-server/files/patch-CMakeLists.txt | 12 | ||||
-rw-r--r-- | databases/mariadb101-server/files/patch-MDEV-12281 | 15 |
2 files changed, 20 insertions, 7 deletions
diff --git a/databases/mariadb101-server/files/patch-CMakeLists.txt b/databases/mariadb101-server/files/patch-CMakeLists.txt index 6133bbc0be89..e79a34edc9d1 100644 --- a/databases/mariadb101-server/files/patch-CMakeLists.txt +++ b/databases/mariadb101-server/files/patch-CMakeLists.txt @@ -1,16 +1,14 @@ -Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options - ---- CMakeLists.txt.orig 2016-03-24 09:12:10 UTC +--- CMakeLists.txt.orig 2017-05-02 05:13:38 UTC +++ CMakeLists.txt -@@ -460,6 +460,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 +471,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() diff --git a/databases/mariadb101-server/files/patch-MDEV-12281 b/databases/mariadb101-server/files/patch-MDEV-12281 new file mode 100644 index 000000000000..ffbd1833f294 --- /dev/null +++ b/databases/mariadb101-server/files/patch-MDEV-12281 @@ -0,0 +1,15 @@ +--- storage/innobase/dict/dict0stats.cc.orig 2017-05-02 07:13:44.000000000 +0200 ++++ storage/innobase/dict/dict0stats.cc 2017-05-03 17:26:34.159233678 +0200 +@@ -1168,10 +1168,10 @@ + leaf-level delete marks because delete marks on + non-leaf level do not make sense. */ + +- if (level == 0 && srv_stats_include_delete_marked? 0: ++ if (level == 0 && (srv_stats_include_delete_marked ? 0: + rec_get_deleted_flag( + rec, +- page_is_comp(btr_pcur_get_page(&pcur)))) { ++ page_is_comp(btr_pcur_get_page(&pcur))))) { + + if (rec_is_last_on_page + && !prev_rec_is_copied |