← Back to team overview

maria-developers team mailing list archive

  1. maria-developers team
  2. Mailing list archive
  3. Message #03278

[Branch ~maria-captains/maria/5.1-converting] Rev 2862: allow federated and innodb_plugin to be built

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 2862
committer: Sergei Golubchik <sergii@xxxxxxxxx>
branch nick: 5.1
timestamp: Wed 2010-06-09 23:29:18 +0200
message:
  allow federated and innodb_plugin to be built
renamed:
  storage/federated/plug.in.disabled => storage/federated/plug.in
  storage/innodb_plugin/plug.in.disabled => storage/innodb_plugin/plug.in
modified:
  storage/federated/Makefile.am
  storage/federatedx/Makefile.am
  storage/federatedx/ha_federatedx.cc
  storage/federatedx/plug.in
  storage/xtradb/CMakeLists.txt
  storage/xtradb/Makefile.am
  storage/xtradb/handler/ha_innodb.cc
  storage/xtradb/plug.in
  storage/federated/plug.in
  storage/innodb_plugin/plug.in


--
lp:~maria-captains/maria/5.1-converting
https://code.launchpad.net/~maria-captains/maria/5.1-converting

Your team Maria developers is subscribed to branch lp:~maria-captains/maria/5.1-converting.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1-converting/+edit-subscription

=== modified file 'storage/federated/Makefile.am'
--- storage/federated/Makefile.am	2008-01-02 13:00:46 +0000
+++ storage/federated/Makefile.am	2010-06-09 21:29:18 +0000
@@ -26,8 +26,6 @@
                         -I$(srcdir)
 WRAPLIBS=
 
-LDADD =
-
 DEFS =                  @DEFS@
 
 noinst_HEADERS =	ha_federated.h
@@ -37,7 +35,7 @@
 ha_federated_la_LDFLAGS =	-module -rpath $(pkgplugindir)
 ha_federated_la_CXXFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_federated_la_CFLAGS =	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_federated_la_SOURCES =	ha_federated.cc
+ha_federated_la_SOURCES =	ha_federated.cc $(top_srcdir)/mysys/string.c
 
 
 EXTRA_LIBRARIES =	libfederated.a

=== renamed file 'storage/federated/plug.in.disabled' => 'storage/federated/plug.in'
--- storage/federated/plug.in.disabled	2009-11-14 19:33:59 +0000
+++ storage/federated/plug.in	2010-06-09 21:29:18 +0000
@@ -1,5 +1,5 @@
 MYSQL_STORAGE_ENGINE(federated,,[Federated Storage Engine],
-        [Connects to tables on remote MySQL servers], [max,max-no-ndb])
+        [Connects to tables on remote MySQL servers], [])
 MYSQL_PLUGIN_STATIC(federated,    [libfederated.a])
 MYSQL_PLUGIN_DYNAMIC(federated,   [ha_federated.la])
 MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(federated, [ha_federated.cc])

=== modified file 'storage/federatedx/Makefile.am'
--- storage/federatedx/Makefile.am	2009-12-03 11:34:11 +0000
+++ storage/federatedx/Makefile.am	2010-06-09 21:29:18 +0000
@@ -18,14 +18,14 @@
 noinst_HEADERS =	ha_federatedx.h federatedx_probes.h
 
 EXTRA_LTLIBRARIES =	ha_federatedx.la
-pkgplugin_LTLIBRARIES =	@plugin_federated_shared_target@
+pkgplugin_LTLIBRARIES =	@plugin_federatedx_shared_target@
 ha_federatedx_la_LDFLAGS =	-module -rpath $(pkgplugindir)
 ha_federatedx_la_CXXFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_federatedx_la_CFLAGS =	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 
 
 EXTRA_LIBRARIES =	libfederatedx.a
-noinst_LIBRARIES =	@plugin_federated_static_target@
+noinst_LIBRARIES =	@plugin_federatedx_static_target@
 libfederatedx_a_CXXFLAGS =	$(AM_CFLAGS)
 libfederatedx_a_CFLAGS =	$(AM_CFLAGS)
 libfederatedx_a_SOURCES=	ha_federatedx.cc federatedx_txn.cc \

=== modified file 'storage/federatedx/ha_federatedx.cc'
--- storage/federatedx/ha_federatedx.cc	2010-03-10 10:32:14 +0000
+++ storage/federatedx/ha_federatedx.cc	2010-06-09 21:29:18 +0000
@@ -3495,7 +3495,7 @@
 struct st_mysql_storage_engine federatedx_storage_engine=
 { MYSQL_HANDLERTON_INTERFACE_VERSION };
 
-mysql_declare_plugin(federated)
+mysql_declare_plugin(federatedx)
 {
   MYSQL_STORAGE_ENGINE_PLUGIN,
   &federatedx_storage_engine,

=== modified file 'storage/federatedx/plug.in'
--- storage/federatedx/plug.in	2009-11-14 19:33:59 +0000
+++ storage/federatedx/plug.in	2010-06-09 21:29:18 +0000
@@ -1,5 +1,5 @@
-MYSQL_STORAGE_ENGINE(federated,,[FederatedX Storage Engine],
+MYSQL_STORAGE_ENGINE(federatedx,,[FederatedX Storage Engine],
         [FederatedX Storage Engine], [max,max-no-ndb])
-MYSQL_PLUGIN_DYNAMIC(federated,   [ha_federatedx.la])
-MYSQL_PLUGIN_STATIC(federated,    [libfederatedx.a])
-MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(federated, [ha_federatedx.cc])
+MYSQL_PLUGIN_DYNAMIC(federatedx,   [ha_federatedx.la])
+MYSQL_PLUGIN_STATIC(federatedx,    [libfederatedx.a])
+MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(federatedx, [ha_federatedx.cc])

=== renamed file 'storage/innodb_plugin/plug.in.disabled' => 'storage/innodb_plugin/plug.in'
--- storage/innodb_plugin/plug.in.disabled	2010-05-26 18:55:40 +0000
+++ storage/innodb_plugin/plug.in	2010-06-09 21:29:18 +0000
@@ -15,7 +15,7 @@
 #
 
 MYSQL_STORAGE_ENGINE(innodb_plugin,, [InnoDB Storage Engine],
-        [Transactional Tables using InnoDB], [max,max-no-ndb])
+        [Transactional Tables using InnoDB], [])
 MYSQL_PLUGIN_DIRECTORY(innodb_plugin, [storage/innodb_plugin])
 MYSQL_PLUGIN_DYNAMIC(innodb_plugin,  [ha_innodb_plugin.la])
 MYSQL_PLUGIN_ACTIONS(innodb_plugin,  [

=== modified file 'storage/xtradb/CMakeLists.txt'
--- storage/xtradb/CMakeLists.txt	2010-01-15 15:58:25 +0000
+++ storage/xtradb/CMakeLists.txt	2010-06-09 21:29:18 +0000
@@ -31,7 +31,7 @@
 
 ADD_DEFINITIONS(-D_WIN32 -D_LIB -DMYSQL_SERVER)
 
-# Include directories under innobase
+# Include directories under xtradb
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/xtradb/include
                     ${CMAKE_SOURCE_DIR}/storage/xtradb/handler)
  
@@ -49,7 +49,7 @@
 				    PROPERTIES COMPILE_FLAGS -Od)
 ENDIF (MSVC AND $(WIN64))
 
-SET(INNOBASE_SOURCES	btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c
+SET(XTRADB_SOURCES	btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c
 			buf/buf0buddy.c buf/buf0buf.c buf/buf0flu.c buf/buf0lru.c buf/buf0rea.c
 			data/data0data.c data/data0type.c
 			dict/dict0boot.c dict/dict0crea.c dict/dict0dict.c dict/dict0load.c dict/dict0mem.c
@@ -85,17 +85,16 @@
 ADD_DEFINITIONS(-DHAVE_WINDOWS_ATOMICS -DIB_HAVE_PAUSE_INSTRUCTION)
 
 IF (MYSQL_VERSION_ID GREATER "50137")
-	MYSQL_STORAGE_ENGINE(INNOBASE)
-	# Use ha_innodb for plugin name, if plugin is built
-	GET_TARGET_PROPERTY(LIB_LOCATION ha_innobase LOCATION)
+	MYSQL_STORAGE_ENGINE(XTRADB)
+	GET_TARGET_PROPERTY(LIB_LOCATION ha_xtradb LOCATION)
 	IF(LIB_LOCATION)
-		SET_TARGET_PROPERTIES(ha_innobase PROPERTIES OUTPUT_NAME ha_innodb)
+		SET_TARGET_PROPERTIES(ha_xtradb PROPERTIES OUTPUT_NAME ha_xtradb)
 	ENDIF(LIB_LOCATION)
 ELSE (MYSQL_VERSION_ID GREATER "50137")
 	IF (NOT SOURCE_SUBLIBS)
 		ADD_DEFINITIONS(-D_WIN32 -DMYSQL_SERVER)
-		ADD_LIBRARY(innobase STATIC ${INNOBASE_SOURCES})
+		ADD_LIBRARY(xtradb STATIC ${XTRADB_SOURCES})
 		# Require mysqld_error.h, which is built as part of the GenError
-		ADD_DEPENDENCIES(innobase GenError)
+		ADD_DEPENDENCIES(xtradb GenError)
 	ENDIF (NOT SOURCE_SUBLIBS)
 ENDIF (MYSQL_VERSION_ID GREATER "50137")

=== modified file 'storage/xtradb/Makefile.am'
--- storage/xtradb/Makefile.am	2010-01-15 15:58:25 +0000
+++ storage/xtradb/Makefile.am	2010-06-09 21:29:18 +0000
@@ -228,9 +228,9 @@
 			handler/innodb_patch_info.h	\
 			mem/mem0dbg.c
 
-EXTRA_LIBRARIES=	libinnobase.a
-noinst_LIBRARIES=	@plugin_innobase_static_target@
-libinnobase_a_SOURCES=	\
+EXTRA_LIBRARIES=	libxtradb.a
+noinst_LIBRARIES=	@plugin_xtradb_static_target@
+libxtradb_a_SOURCES=	\
 			btr/btr0btr.c			\
 			btr/btr0cur.c			\
 			btr/btr0pcur.c			\
@@ -324,16 +324,16 @@
 			ut/ut0vec.c			\
 			ut/ut0wqueue.c
 
-libinnobase_a_CXXFLAGS=	$(AM_CFLAGS)
-libinnobase_a_CFLAGS=	$(AM_CFLAGS)
-
-EXTRA_LTLIBRARIES=	ha_innodb.la
-pkgplugin_LTLIBRARIES=	@plugin_innobase_shared_target@
-
-ha_innodb_la_LDFLAGS=	-module -rpath $(pkgplugindir)
-ha_innodb_la_CXXFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
-ha_innodb_la_CFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
-ha_innodb_la_SOURCES=	$(libinnobase_a_SOURCES)
+libxtradb_a_CXXFLAGS=	$(AM_CFLAGS)
+libxtradb_a_CFLAGS=	$(AM_CFLAGS)
+
+EXTRA_LTLIBRARIES=	ha_xtradb.la
+pkgplugin_LTLIBRARIES=	@plugin_xtradb_shared_target@
+
+ha_xtradb_la_LDFLAGS=	-module -rpath $(pkgplugindir)
+ha_xtradb_la_CXXFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ha_xtradb_la_CFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ha_xtradb_la_SOURCES=	$(libxtradb_a_SOURCES)
 
 EXTRA_DIST=		CMakeLists.txt plug.in \
 			pars/make_bison.sh pars/make_flex.sh \

=== modified file 'storage/xtradb/handler/ha_innodb.cc'
--- storage/xtradb/handler/ha_innodb.cc	2010-04-28 19:29:45 +0000
+++ storage/xtradb/handler/ha_innodb.cc	2010-06-09 21:29:18 +0000
@@ -10920,7 +10920,7 @@
   NULL
 };
 
-mysql_declare_plugin(innobase)
+mysql_declare_plugin(xtradb)
 {
   MYSQL_STORAGE_ENGINE_PLUGIN,
   &innobase_storage_engine,

=== modified file 'storage/xtradb/plug.in'
--- storage/xtradb/plug.in	2010-01-15 15:58:25 +0000
+++ storage/xtradb/plug.in	2010-06-09 21:29:18 +0000
@@ -14,12 +14,12 @@
 # Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-MYSQL_STORAGE_ENGINE(innobase,  innodb, [InnoDB Storage Engine],
-        [Transactional Tables using InnoDB], [max,max-no-ndb])
-MYSQL_PLUGIN_DIRECTORY(innobase, [storage/xtradb])
-MYSQL_PLUGIN_STATIC(innobase,   [libinnobase.a])
-MYSQL_PLUGIN_DYNAMIC(innobase,  [ha_innodb.la])
-MYSQL_PLUGIN_ACTIONS(innobase,  [
+MYSQL_STORAGE_ENGINE(xtradb,  innodb, [XtraDB Storage Engine],
+        [XtraDB - a drop-in replacement for InnoDB], [max,max-no-ndb])
+MYSQL_PLUGIN_DIRECTORY(xtradb, [storage/xtradb])
+MYSQL_PLUGIN_STATIC(xtradb,   [libxtradb.a])
+MYSQL_PLUGIN_DYNAMIC(xtradb,  [ha_xtradb.la])
+MYSQL_PLUGIN_ACTIONS(xtradb,  [
   AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])
   AC_SUBST(innodb_system_libs)
   AC_CHECK_HEADERS(aio.h sched.h)
  Thread Previous • Date Previous • • Thread Next