[Commits] bzr commit into Mariadb 5.2, with Maria 2.0:maria/5.2 branch (knielsen:2819)

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Fri Jul 2 16:09:31 EEST 2010


#At lp:maria/5.2

 2819 knielsen at knielsen-hq.org	2010-07-02
      Make SphinxSE be build as loadable .so by default.
      added:
        mysql-test/suite/sphinx/suite.opt
      modified:
        mysql-test/lib/mtr_cases.pm
        storage/sphinx/Makefile.am
        storage/sphinx/plug.in

=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2010-07-01 11:40:38 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2010-07-02 13:09:28 +0000
@@ -1086,6 +1086,16 @@ sub collect_one_test_case {
     }
   }
 
+  if ( $tinfo->{'sphinxse_test'} )
+  {
+    if ( !$ENV{'HA_SPHINX_SO'} )
+    {
+      $tinfo->{'skip'}= 1;
+      $tinfo->{'comment'}= "Test requires the Sphinx storage engine";
+      return $tinfo;
+    }
+  }
+
   if ( $tinfo->{'sphinx_test'} )
   {
     if ( !$ENV{'HAVE_SPHINX'} )

=== added file 'mysql-test/suite/sphinx/suite.opt'
--- a/mysql-test/suite/sphinx/suite.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sphinx/suite.opt	2010-07-02 13:09:28 +0000
@@ -0,0 +1 @@
+--plugin-load=$HA_SPHINX_SO
\ No newline at end of file

=== modified file 'storage/sphinx/Makefile.am'
--- a/storage/sphinx/Makefile.am	2010-05-14 22:23:57 +0000
+++ b/storage/sphinx/Makefile.am	2010-07-02 13:09:28 +0000
@@ -38,7 +38,8 @@ noinst_HEADERS =	ha_sphinx.h
 EXTRA_LTLIBRARIES =	ha_sphinx.la
 pkgplugin_LTLIBRARIES = @plugin_sphinx_shared_target@ sphinx.la
 
-ha_sphinx_la_LDFLAGS =	-module -rpath $(MYSQLLIBdir)
+ha_sphinx_la_LDFLAGS =	-module -rpath $(MYSQLLIBdir) \
+			-L$(top_builddir)/libservices -lmysqlservices
 ha_sphinx_la_CXXFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_sphinx_la_CFLAGS =	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_sphinx_la_SOURCES =	ha_sphinx.cc

=== modified file 'storage/sphinx/plug.in'
--- a/storage/sphinx/plug.in	2010-05-25 23:16:46 +0000
+++ b/storage/sphinx/plug.in	2010-07-02 13:09:28 +0000
@@ -1,5 +1,5 @@
 MYSQL_STORAGE_ENGINE(sphinx,,[Sphinx Storage Engine],
-        [SE client for Sphinx search daemon], [max,max-no-ndb])
+        [SE client for Sphinx search daemon], [])
 MYSQL_PLUGIN_DIRECTORY(sphinx, [storage/sphinx])
 MYSQL_PLUGIN_STATIC(sphinx,  [libsphinx.a])
 MYSQL_PLUGIN_DYNAMIC(sphinx, [ha_sphinx.la])



More information about the commits mailing list