[Commits] Rev 2862: oqgraph and sphinx on windows in http://bazaar.launchpad.net/~maria-captains/maria/5.2/

serg at askmonty.org serg at askmonty.org
Tue Sep 14 10:29:00 EEST 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.2/

------------------------------------------------------------
revno: 2862
revision-id: sergii at pisem.net-20100914072855-iotry0zp6sehidy2
parent: sergii at pisem.net-20100913212933-yqtqhyp6dz3godce
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.2
timestamp: Tue 2010-09-14 09:28:55 +0200
message:
  oqgraph and sphinx on windows
-------------- next part --------------
=== modified file 'CMakeLists.txt' (properties changed: +x to -x)
=== modified file 'mysql-test/suite/oqgraph/suite.opt'
--- a/mysql-test/suite/oqgraph/suite.opt	2010-09-12 12:32:17 +0000
+++ b/mysql-test/suite/oqgraph/suite.opt	2010-09-14 07:28:55 +0000
@@ -1 +1 @@
---plugin-load=$OQGRAPH_ENGINE_SO
+--plugin-load=$HA_OQGRAPH_SO

=== modified file 'mysql-test/suite/oqgraph/suite.pm'
--- a/mysql-test/suite/oqgraph/suite.pm	2010-09-12 12:32:17 +0000
+++ b/mysql-test/suite/oqgraph/suite.pm	2010-09-14 07:28:55 +0000
@@ -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 { };
 

=== modified file 'storage/oqgraph/CMakeFiles.txt'
--- a/storage/oqgraph/CMakeFiles.txt	2010-01-04 08:27:50 +0000
+++ b/storage/oqgraph/CMakeFiles.txt	2010-09-14 07:28:55 +0000
@@ -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_DEBUG} -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)

=== modified file 'storage/oqgraph/Makefile.am'
--- a/storage/oqgraph/Makefile.am	2010-05-15 08:44:55 +0000
+++ b/storage/oqgraph/Makefile.am	2010-09-14 07:28:55 +0000
@@ -51,7 +51,7 @@ EXTRA_DIST =	ha_oqgraph.h ha_oqgraph.cc 
 
 # 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 = -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

=== modified file 'storage/oqgraph/graphcore.cc'
--- a/storage/oqgraph/graphcore.cc	2010-08-06 08:05:44 +0000
+++ b/storage/oqgraph/graphcore.cc	2010-09-14 07:28:55 +0000
@@ -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 &r
                             const reference &ref)
 {
   last= ref;
-  if (optional<Vertex> v= last.vertex())
+  if (last.vertex())
   {
     optional<int> seq;
     optional<EdgeWeight> w;

=== modified file 'storage/oqgraph/plug.in'
--- a/storage/oqgraph/plug.in	2010-09-13 18:31:52 +0000
+++ b/storage/oqgraph/plug.in	2010-09-14 07:28:55 +0000
@@ -1,6 +1,6 @@
 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++])

=== modified file 'storage/pbxt/CMakeLists.txt'
--- a/storage/pbxt/CMakeLists.txt	2009-10-06 18:26:11 +0000
+++ b/storage/pbxt/CMakeLists.txt	2010-09-14 07:28:55 +0000
@@ -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")
 

=== modified file 'storage/sphinx/CMakeLists.txt'
--- a/storage/sphinx/CMakeLists.txt	2010-07-09 12:03:09 +0000
+++ b/storage/sphinx/CMakeLists.txt	2010-09-14 07:28:55 +0000
@@ -1,5 +1,5 @@
-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}/
                     ${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)



More information about the commits mailing list