mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Require Boost version 1.40.0 to build OQGraph (earlier versions have a bug).

Browse source 
storage/oqgraph/README:
  Added small README explaining the need for Boost
storage/oqgraph/graphcore.cc:
  Fix using deprecated header that is gone in recent Boost.
storage/oqgraph/plug.in:
  Change Boost detection to look for version number (patch by Sergei Golubchik).
This commit is contained in:
unknown 2010-03-30 09:33:38 +02:00
parent 7a3163cf06
commit 205baff9ab
3 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
storage/oqgraph/README Normal file
View file

@ -0,0 +1,16 @@
OQGraph storage engine
Copyright (C) 2007-2009 Arjen G Lentz & Antony T Curtis for Open Query
The Open Query GRAPH engine (OQGRAPH) is a computation engine allowing
hierarchies and more complex graph structures to be handled in a
relational fashion. In a nutshell, tree structures and
friend-of-a-friend style searches can now be done using standard SQL
syntax, and results joined onto other tables.
See http://openquery.com/graph for more information.
INSTALLATION
OQGraph requires at least version 1.40.0 of the Boost library. To
obtain a copy of the Boost library, see http://www.boost.org/

2
storage/oqgraph/graphcore.cc
View file

@ -33,7 +33,7 @@
#include <set>
#include <stack>
#include <boost/property_map.hpp>
#include <boost/property_map/property_map.hpp>
#include <boost/graph/graph_concepts.hpp>
#include <boost/graph/graph_archetypes.hpp>

32
storage/oqgraph/plug.in
View file

@ -7,26 +7,18 @@ AM_CONDITIONAL([BUILD_OQGRAPH_STANDALONE], false)
AM_CONDITIONAL([HAVE_DTRACE], false)
AC_LANG_PUSH([C++])
AC_CHECK_HEADER([boost/graph/properties.hpp],[:],[
mysql_plugin_oqgraph=no
with_plugin_oqgraph=no
])
save_CXXFLAGS="${CXXFLAGS}"
CXXFLAGS="-fexceptions -fimplicit-templates -O3 -fstrict-aliasing -falign-loops -fvisibility-inlines-hidden -funroll-loops -fno-trapping-math"
AC_MSG_CHECKING([for Boost usable by OQGraph engine])
AC_PREPROC_IFELSE(
[
#include <boost/version.hpp>
#if BOOST_VERSION >= 104000
#else
#error oops
#endif
],
[AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
with_plugin_oqgraph=no])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/dijkstra_shortest_paths.hpp>
using namespace boost;
]],[[
typedef adjacency_list<vecS, vecS, bidirectionalS> Graph;
Graph g(10);
]])],[],[
mysql_plugin_oqgraph=no
with_plugin_oqgraph=no
])
CXXFLAGS="${save_CXXFLAGS}"
AC_LANG_POP()