Backport upstream MDEV-9479 fix: oqgraph fails to build with boost 1.60

When the version of boost is >= 1.6 we had a failure in compiling
oqgraph. By #ifdef-ing for this version we remove the problem.

debian/changelog

 mariadb-10.0 (10.0.25-1) UNRELEASED; urgency=low
 
+  [ Otto Kekäläinen ]
   * Revert previous changes tailored for Ubuntu 16.04 compatibility.
   * New upstream release 10.0.25. Includes fixes for the following
     security vulnerabilities:
@@ -20,6 +21,9 @@ mariadb-10.0 (10.0.25-1) UNRELEASED; urgency=low
   * Updated Turkish translation by Atila KOÇ (Closes: #825802).
   * Add patch to provide passwordless root accounts for test suite.
 
+  [ Vicențiu Ciorbaru ]
+  * Backport upstream MDEV-9479 fix: oqgraph fails to build with boost 1.60
+
  -- Otto Kekäläinen <otto@debian.org>  Sat, 30 Apr 2016 21:00:18 +0300
 
 mariadb-10.0 (10.0.24-7) unstable; urgency=low

debian/patches/mdev-9479-oqgraph-boost.patch

+Description: Make OQGraph compile with Boost 1.6
+ Boost 1.6 changed the interface in boost::graph. Make sure to not use
+ the now removed defines.
+ .
+ This patch should be removed when upstream provides a fix.
+Author: Vicențiu Ciorbaru <cvicentiu@gmail.com>
+Bug: https://jira.mariadb.org/browse/MDEV-9479
+
+--- mariadb-10.0-10.0.25.orig/storage/oqgraph/oqgraph_shim.h
++++ mariadb-10.0-10.0.25/storage/oqgraph/oqgraph_shim.h
+@@ -254,7 +254,7 @@ namespace boost
+     typedef no_property type;
+   };
+ 
+-#if BOOST_VERSION >= 104601
++#if BOOST_VERSION >= 104601 && BOOST_VERSION < 106000
+   template <>
+   struct graph_bundle_type<oqgraph3::graph>
+   {

debian/patches/series

@@ -14,3 +14,4 @@ mdev-8375-passwordless-root-via-socket-auth.patch
 mdev-8375-built-in-auth-socket.patch
 mdev-8375-passwordless-accounts-for-testsuite.patch
 mdev-9528-mysql_embedded.patch
+mdev-9479-oqgraph-boost.patch