diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2018-02-13 16:33:06 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2018-02-13 16:33:06 +0000 |
| commit | 48abcdae8770709dd20e19264839e9becad8ffa1 (patch) | |
| tree | 01fef5394a1dace9368f86d5a0c7f16c1e686095 /databases/mariadb101-server | |
| parent | edb333a21f9d645ab2afe101df1673996da04b27 (diff) | |
| download | ports-48abcdae8770709dd20e19264839e9becad8ffa1.tar.gz ports-48abcdae8770709dd20e19264839e9becad8ffa1.zip | |
databases/mariadb101-server: unbreak OQGraph engine
- Fixes collision in setbit with sys/param.h
PR: 224089
Reported by: jbeich
Notes
Notes:
svn path=/head/; revision=461711
Diffstat (limited to 'databases/mariadb101-server')
| -rw-r--r-- | databases/mariadb101-server/Makefile | 1 | ||||
| -rw-r--r-- | databases/mariadb101-server/files/patch-oqgraph-MDEV-15291 | 40 |
2 files changed, 40 insertions, 1 deletions
diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile index 777417c6ad17..4a3b7be2d07c 100644 --- a/databases/mariadb101-server/Makefile +++ b/databases/mariadb101-server/Makefile @@ -145,7 +145,6 @@ MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4 MROONGA_VARS= LICENSE+=LGPL20 LICENSE_COMB=multi MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack -OQGRAPH_BROKEN= OQGRAPH fails to build, see https://jira.mariadb.org/browse/MDEV-15291. OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF diff --git a/databases/mariadb101-server/files/patch-oqgraph-MDEV-15291 b/databases/mariadb101-server/files/patch-oqgraph-MDEV-15291 new file mode 100644 index 000000000000..05083cd206ac --- /dev/null +++ b/databases/mariadb101-server/files/patch-oqgraph-MDEV-15291 @@ -0,0 +1,40 @@ +--- storage/oqgraph/oqgraph_judy.cc.orig 2018-02-12 15:01:28 UTC ++++ storage/oqgraph/oqgraph_judy.cc +@@ -27,7 +27,7 @@ + /* + Currently the only active code that can return error is: + judy_bitset::reset()/J1U() +- judy_bitset::setbit()/J1S() ++ judy_bitset::jsetbit()/J1S() + + In most cases errors are either about wrong parameters passed to Judy + functions or internal structures corruption. These definitely deserve +@@ -60,7 +60,7 @@ bool open_query::judy_bitset::test(size_ + return rc == 1; + } + +-open_query::judy_bitset& open_query::judy_bitset::setbit(size_type n) ++open_query::judy_bitset& open_query::judy_bitset::jsetbit(size_type n) + { + int rc; + J1S(rc, array, n); +--- storage/oqgraph/oqgraph_judy.h.orig 2018-02-12 15:01:28 UTC ++++ storage/oqgraph/oqgraph_judy.h +@@ -63,7 +63,7 @@ namespace open_query + if (!val) + return reset(n); + else +- return setbit(n); ++ return jsetbit(n); + } + + judy_bitset& set(const judy_bitset& src); +@@ -115,7 +115,7 @@ namespace open_query + private: + mutable void* array; + +- judy_bitset& setbit(size_type n); ++ judy_bitset& jsetbit(size_type n); + }; + } + |