svn commit: r461711 - in head/databases/mariadb101-server: . files

[Bernard Spil]

Author: brnrd
Date: Tue Feb 13 16:33:06 2018
New Revision: 461711
URL: https://svnweb.freebsd.org/changeset/ports/461711

Log:
  databases/mariadb101-server: unbreak OQGraph engine
  
   - Fixes collision in setbit with sys/param.h
  
  PR:		224089
  Reported by:	jbeich

Added:
  head/databases/mariadb101-server/files/patch-oqgraph-MDEV-15291   (contents, props changed)
Modified:
  head/databases/mariadb101-server/Makefile

Modified: head/databases/mariadb101-server/Makefile
==============================================================================
--- head/databases/mariadb101-server/Makefile	Tue Feb 13 15:39:44 2018	(r461710)
+++ head/databases/mariadb101-server/Makefile	Tue Feb 13 16:33:06 2018	(r461711)
@@ -145,7 +145,6 @@ MAXKEY_EXTRA_PATCHES+=	${FILESDIR}/extra-patch-include
 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

Added: head/databases/mariadb101-server/files/patch-oqgraph-MDEV-15291
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mariadb101-server/files/patch-oqgraph-MDEV-15291	Tue Feb 13 16:33:06 2018	(r461711)
@@ -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);
+   };
+ }
+