oqgraph and sphinx on windows

mysql-test/suite/oqgraph/suite.opt

---plugin-load=$OQGRAPH_ENGINE_SO
+--plugin-load=$HA_OQGRAPH_SO

mysql-test/suite/oqgraph/suite.pm

@@ -2,7 +2,7 @@ package My::Suite::OQGraph;
 
 @ISA = qw(My::Suite);
 
-return "No OQGraph" unless $ENV{OQGRAPH_ENGINE_SO};
+return "No OQGraph" unless $ENV{HA_OQGRAPH_SO};
 
 bless { };
 

storage/oqgraph/CMakeFiles.txt → storage/oqgraph/CMakeLists.txt

@@ -13,10 +13,25 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
+INCLUDE (CheckCXXSourceCompiles)
+CHECK_CXX_SOURCE_COMPILES(
+"#include <boost/version.hpp>
+#if BOOST_VERSION >= 104000
+#else
+#error oops
+#endif
+int main() { return 0; }" BOOST_OK)
+
+IF(BOOST_OK)
+  INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
+
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_OQGRAPH /EHsc")
+
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql
+                      ${CMAKE_SOURCE_DIR}/regex
+                      ${CMAKE_SOURCE_DIR}/extra/yassl/include)
+
+  SET(OQGRAPH_SOURCES ha_oqgraph.cc graphcore.cc)
+  MYSQL_STORAGE_ENGINE(OQGRAPH)
+ENDIF()
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql
-                    ${CMAKE_SOURCE_DIR}/regex
-                    ${CMAKE_SOURCE_DIR}/extra/yassl/include)
-ADD_LIBRARY(oqgraph ha_oqgraph.cc)

storage/oqgraph/Makefile.am

@@ -47,11 +47,11 @@ BOOST_CXXFLAGS+=	-funroll-loops -fno-trapping-math
 
 EXTRA_DIST =	ha_oqgraph.h ha_oqgraph.cc graphcore.cc \
 		graphcore-graph.h graphcore-types.h graphcore.h \
-		CMakeFiles.txt plug.in oqgraph_probes.d
+		CMakeLists.txt plug.in oqgraph_probes.d
 
 # DTRACE =                @DTRACE@
 # DTRACEFLAGS =           @DTRACEFLAGS@
-# DTRACEFILES =           .libs/liboqgraph_engine_la-ha_oqgraph.o
+# DTRACEFILES =           .libs/libha_oqgraph_la-ha_oqgraph.o
 
 ORIG_CXXFLAGS = @CXXFLAGS@
 CXXFLAGS=
@@ -71,18 +71,18 @@ else
 INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/regex -I$(top_srcdir)/sql -I$(srcdir) -DHAVE_OQGRAPH 
 endif !BUILD_OQGRAPH_STANDALONE
 
-EXTRA_LTLIBRARIES = oqgraph_engine.la
+EXTRA_LTLIBRARIES = ha_oqgraph.la
 mysqlplugin_LTLIBRARIES = @plugin_oqgraph_shared_target@
-oqgraph_engine_la_SOURCES = ha_oqgraph.cc
-oqgraph_engine_la_LIBADD = libgraphcore.la
+ha_oqgraph_la_SOURCES = ha_oqgraph.cc
+ha_oqgraph_la_LIBADD = libgraphcore.la
 
 # if HAVE_DTRACE
-#   oqgraph_engine_la_LIBADD += oqgraph_probes.o
+#   ha_oqgraph_la_LIBADD += oqgraph_probes.o
 # endif
 
-oqgraph_engine_la_LDFLAGS =	-module -rpath $(mysqlplugindir)
-oqgraph_engine_la_CFLAGS = $(ORIG_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-oqgraph_engine_la_CXXFLAGS = $(ORIG_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ha_oqgraph_la_LDFLAGS =	-shared -module -rpath $(mysqlplugindir)
+ha_oqgraph_la_CFLAGS = $(ORIG_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ha_oqgraph_la_CXXFLAGS = $(ORIG_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 
 # oqgraph_probes.h: oqgraph_probes.d
 # 	$(DTRACE) $(DTRACEFLAGS) -h -s oqgraph_probes.d

storage/oqgraph/graphcore.cc

@@ -24,7 +24,7 @@
    ======================================================================
 */
 
-#include <strings.h>
+#include <string.h>
 
 #define BOOST_ALL_NO_LIB 1
 
@@ -997,7 +997,7 @@ int stack_cursor::fetch_row(const row &row_info, row &result,
                             const reference &ref)
 {
   last= ref;
-  if (optional<Vertex> v= last.vertex())
+  if (last.vertex())
   {
     optional<int> seq;
     optional<EdgeWeight> w;

storage/oqgraph/plug.in

 MYSQL_STORAGE_ENGINE(oqgraph,,[Graph Storage Engine],
         [Open Query Graph Computation Engine], [])
-MYSQL_PLUGIN_DYNAMIC(oqgraph,   [oqgraph_engine.la])
+MYSQL_PLUGIN_DYNAMIC(oqgraph,   [ha_oqgraph.la])
 MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(oqgraph, [ha_oqgraph.cc])
 MYSQL_PLUGIN_ACTIONS(oqgraph,[
   AC_LANG_PUSH([C++])

storage/pbxt/CMakeLists.txt

@@ -22,6 +22,8 @@
 #
 # This file is used to make the Windows version
 
+INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
+
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMYSQL_SERVER")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMYSQL_SERVER")
 
@@ -101,3 +103,4 @@ src/xt_defs.h
 src/xt_errno.h)
 
 MYSQL_STORAGE_ENGINE(PBXT)
+

storage/sphinx/CMakeLists.txt

-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
+INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
+
 ADD_DEFINITIONS(-DMYSQL_SERVER)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
@@ -8,4 +8,5 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/regex)
 
 SET(SPHINX_SOURCES ha_sphinx.cc)
-ADD_LIBRARY(sphinx ha_sphinx.cc)
+SET(SPHINX_LIBS ws2_32.lib)
+MYSQL_STORAGE_ENGINE(SPHINX)