merge

16 files changed, 48 insertions, 58 deletions

diff --git a/storage/blackhole/plug.in b/storage/blackhole/plug.in
index 2f3b120fa5d..84b7299969b 100644
--- a/storage/blackhole/plug.in
+++ b/storage/blackhole/plug.in
@@ -1,6 +1,5 @@
 MYSQL_STORAGE_ENGINE(blackhole,,[Blackhole Storage Engine],
         [Basic Write-only Read-never tables], [max,max-no-ndb])
-MYSQL_PLUGIN_DIRECTORY(blackhole, [storage/blackhole])
 MYSQL_PLUGIN_STATIC(blackhole,  [libblackhole.la])
 MYSQL_PLUGIN_DYNAMIC(blackhole, [ha_blackhole.la])
 
diff --git a/storage/csv/plug.in b/storage/csv/plug.in
index 4ff32959fa2..eb4bd4d9883 100644
--- a/storage/csv/plug.in
+++ b/storage/csv/plug.in
@@ -1,5 +1,4 @@
 MYSQL_STORAGE_ENGINE(csv,,      [CSV Storage Engine],
         [Stores tables in text CSV format])
-MYSQL_PLUGIN_DIRECTORY(csv,     [storage/csv])
 MYSQL_PLUGIN_STATIC(csv,        [libcsv.la])
 MYSQL_PLUGIN_MANDATORY(csv)     dnl Used for logging
diff --git a/storage/heap/plug.in b/storage/heap/plug.in
index 92ec01d3c88..f1b02b38c2b 100644
--- a/storage/heap/plug.in
+++ b/storage/heap/plug.in
@@ -1,6 +1,5 @@
 MYSQL_STORAGE_ENGINE(heap,no,   [Memory Storage Engine],
         [Volatile memory based tables])
-MYSQL_PLUGIN_DIRECTORY(heap,    [storage/heap])
 MYSQL_PLUGIN_STATIC(heap,       [libheap_s.la], [libheap_embedded.la])
 MYSQL_PLUGIN_MANDATORY(heap)    dnl Memory tables
 
diff --git a/storage/innobase/plug.in.disabled b/storage/innobase/plug.in.disabled
index b18950b9c7a..2d6af1d2883 100644
--- a/storage/innobase/plug.in.disabled
+++ b/storage/innobase/plug.in.disabled
@@ -1,6 +1,5 @@
 MYSQL_STORAGE_ENGINE(innobase, innodb, [InnoDB Storage Engine],
         [Transactional Tables using InnoDB], [max,max-no-ndb])
-MYSQL_PLUGIN_DIRECTORY(innobase, [storage/innobase])
 MYSQL_PLUGIN_STATIC(innobase,   [libinnobase.la])
 MYSQL_PLUGIN_DYNAMIC(innobase,  [ha_innodb.la])
 MYSQL_PLUGIN_ACTIONS(innobase,  [
diff --git a/storage/innodb_plugin/plug.in b/storage/innodb_plugin/plug.in
index ebaa3f574a0..e5e2def5435 100644
--- a/storage/innodb_plugin/plug.in
+++ b/storage/innodb_plugin/plug.in
@@ -16,7 +16,6 @@
 
 MYSQL_STORAGE_ENGINE(innodb_plugin,, [InnoDB Storage Engine],
         [Transactional Tables using InnoDB], [])
-MYSQL_PLUGIN_DIRECTORY(innodb_plugin, [storage/innodb_plugin])
 # Enable if you know what you are doing (trying to link both InnoDB and
 # InnoDB Plugin statically into MySQL does not work).
 #MYSQL_PLUGIN_STATIC(innodb_plugin, [libinnobase.a])
diff --git a/storage/maria/CMakeLists.txt b/storage/maria/CMakeLists.txt
index 7e32d2fe3d8..77083c5839f 100644
--- a/storage/maria/CMakeLists.txt
+++ b/storage/maria/CMakeLists.txt
@@ -50,36 +50,36 @@ MYSQL_STORAGE_ENGINE(ARIA)
 IF(NOT SOURCE_SUBLIBS)
 
 
-  ADD_DEPENDENCIES(aria GenError)
+  ADD_DEPENDENCIES(libaria_s GenError)
 
 MYSQL_ADD_EXECUTABLE(aria_ftdump maria_ftdump.c)
-TARGET_LINK_LIBRARIES(aria_ftdump aria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(aria_ftdump libaria_s libmyisam_s mysys dbug strings zlib wsock32)
 
 MYSQL_ADD_EXECUTABLE(aria_chk maria_chk.c)
-TARGET_LINK_LIBRARIES(aria_chk aria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(aria_chk libaria_s libmyisam_s mysys dbug strings zlib wsock32)
 
 MYSQL_ADD_EXECUTABLE(aria_read_log maria_read_log.c)
-TARGET_LINK_LIBRARIES(aria_read_log aria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(aria_read_log libaria_s libmyisam_s mysys dbug strings zlib wsock32)
 
 MYSQL_ADD_EXECUTABLE(aria_pack maria_pack.c)
-TARGET_LINK_LIBRARIES(aria_pack aria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(aria_pack libaria_s libmyisam_s mysys dbug strings zlib wsock32)
 
 MYSQL_ADD_EXECUTABLE(aria_dump_log maria_dump_log.c unittest/ma_loghandler_examples.c)
-TARGET_LINK_LIBRARIES(aria_dump_log aria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(aria_dump_log libaria_s libmyisam_s mysys dbug strings zlib wsock32)
 
 
 ADD_EXECUTABLE(ma_test1 ma_test1.c)
-TARGET_LINK_LIBRARIES(ma_test1 aria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(ma_test1 libaria_s libmyisam_s mysys dbug strings zlib wsock32)
 
 ADD_EXECUTABLE(ma_test2 ma_test2.c)
-TARGET_LINK_LIBRARIES(ma_test2 aria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(ma_test2 libaria_s libmyisam_s mysys dbug strings zlib wsock32)
 
 ADD_EXECUTABLE(ma_test3 ma_test3.c)
-TARGET_LINK_LIBRARIES(ma_test3 aria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(ma_test3 libaria_s libmyisam_s mysys dbug strings zlib wsock32)
 
 ADD_EXECUTABLE(ma_rt_test ma_rt_test.c)
-TARGET_LINK_LIBRARIES(ma_rt_test aria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(ma_rt_test libaria_s libmyisam_s mysys dbug strings zlib wsock32)
 
 ADD_EXECUTABLE(ma_sp_test ma_sp_test.c)
-TARGET_LINK_LIBRARIES(ma_sp_test aria myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(ma_sp_test libaria_s libmyisam_s mysys dbug strings zlib wsock32)
 ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/storage/maria/plug.in b/storage/maria/plug.in
index c48928be44f..609adcb2f66 100644
--- a/storage/maria/plug.in
+++ b/storage/maria/plug.in
@@ -1,6 +1,5 @@
 MYSQL_STORAGE_ENGINE(aria,, [Aria Storage Engine],
         [Crash-safe tables with MyISAM heritage], [default,max,max-no-ndb])
-MYSQL_PLUGIN_DIRECTORY(aria,  [storage/maria])
 MYSQL_PLUGIN_STATIC(aria,     [libaria_s.la], [libaria_embedded.la])
 
 MYSQL_PLUGIN_ACTIONS(aria,  [
diff --git a/storage/maria/unittest/CMakeLists.txt b/storage/maria/unittest/CMakeLists.txt
index a6e8736daab..715a6199185 100644
--- a/storage/maria/unittest/CMakeLists.txt
+++ b/storage/maria/unittest/CMakeLists.txt
@@ -13,10 +13,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
                     ${CMAKE_SOURCE_DIR}/unittest/mytap)
-LINK_LIBRARIES(maria myisam mytap mysys dbug strings wsock32 zlib)
+LINK_LIBRARIES(libmaria_s libmyisam_s mytap mysys dbug strings wsock32 zlib)
 
 ADD_EXECUTABLE(ma_control_file-t ma_control_file-t.c)
 ADD_EXECUTABLE(trnman-t trnman-t.c)
diff --git a/storage/myisam/CMakeLists.txt b/storage/myisam/CMakeLists.txt
index e7e3de64cf3..ce27c209418 100644
--- a/storage/myisam/CMakeLists.txt
+++ b/storage/myisam/CMakeLists.txt
@@ -32,31 +32,31 @@ MYSQL_STORAGE_ENGINE(MYISAM)
 
 IF(NOT SOURCE_SUBLIBS)
   MYSQL_ADD_EXECUTABLE(myisam_ftdump myisam_ftdump.c DESTINATION bin)
-  TARGET_LINK_LIBRARIES(myisam_ftdump myisam mysys debug dbug strings zlib wsock32)
+  TARGET_LINK_LIBRARIES(myisam_ftdump libmyisam_s mysys debug dbug strings zlib wsock32)
 
   MYSQL_ADD_EXECUTABLE(myisamchk myisamchk.c DESTINATION bin)
-  TARGET_LINK_LIBRARIES(myisamchk myisam mysys debug dbug strings zlib wsock32)
+  TARGET_LINK_LIBRARIES(myisamchk libmyisam_s mysys debug dbug strings zlib wsock32)
 
   MYSQL_ADD_EXECUTABLE(myisamlog myisamlog.c DESTINATION bin)
-  TARGET_LINK_LIBRARIES(myisamlog myisam mysys debug dbug strings zlib wsock32)
+  TARGET_LINK_LIBRARIES(myisamlog libmyisam_s mysys debug dbug strings zlib wsock32)
 
   MYSQL_ADD_EXECUTABLE(myisampack myisampack.c DESTINATION bin)
-  TARGET_LINK_LIBRARIES(myisampack myisam mysys debug dbug strings zlib wsock32)
+  TARGET_LINK_LIBRARIES(myisampack libmyisam_s mysys debug dbug strings zlib wsock32)
 
   ADD_EXECUTABLE(mi_test1 mi_test1.c)
-  TARGET_LINK_LIBRARIES(mi_test1 myisam mysys debug dbug strings zlib wsock32)
+  TARGET_LINK_LIBRARIES(mi_test1 libmyisam_s mysys debug dbug strings zlib wsock32)
 
   ADD_EXECUTABLE(mi_test2 mi_test2.c)
-  TARGET_LINK_LIBRARIES(mi_test2 myisam mysys debug dbug strings zlib wsock32)
+  TARGET_LINK_LIBRARIES(mi_test2 libmyisam_s mysys debug dbug strings zlib wsock32)
 
   ADD_EXECUTABLE(mi_test3 mi_test3.c)
-  TARGET_LINK_LIBRARIES(mi_test3  myisam mysys debug dbug strings zlib wsock32)
+  TARGET_LINK_LIBRARIES(mi_test3  libmyisam_s mysys debug dbug strings zlib wsock32)
 
   ADD_EXECUTABLE(sp_test sp_test.c)
-  TARGET_LINK_LIBRARIES(sp_test myisam mysys debug dbug strings zlib wsock32)
+  TARGET_LINK_LIBRARIES(sp_test libmyisam_s mysys debug dbug strings zlib wsock32)
 
   ADD_EXECUTABLE(rt_test rt_test.c)
-  TARGET_LINK_LIBRARIES(rt_test myisam mysys debug dbug strings zlib wsock32)
+  TARGET_LINK_LIBRARIES(rt_test libmyisam_s mysys debug dbug strings zlib wsock32)
   
   SET_TARGET_PROPERTIES(myisamchk myisampack PROPERTIES LINK_FLAGS "setargv.obj")
 
diff --git a/storage/myisam/plug.in b/storage/myisam/plug.in
index 95b29336493..0ec7ea1e1d2 100644
--- a/storage/myisam/plug.in
+++ b/storage/myisam/plug.in
@@ -1,6 +1,5 @@
 dnl MYSQL_STORAGE_ENGINE(myisam,no, [MyISAM Storage Engine],
 dnl         [Traditional non-transactional MySQL tables])
-dnl MYSQL_PLUGIN_DIRECTORY(myisam,  [storage/myisam])
 dnl MYSQL_PLUGIN_STATIC(myisam,     [libmyisam_s.la], [libmyisam_embedded.la])
 dnl MYSQL_PLUGIN_MANDATORY(myisam)  dnl Default
 
diff --git a/storage/myisammrg/plug.in b/storage/myisammrg/plug.in
index a2654373fba..22cd5b17cb4 100644
--- a/storage/myisammrg/plug.in
+++ b/storage/myisammrg/plug.in
@@ -1,5 +1,4 @@
 MYSQL_STORAGE_ENGINE(myisammrg,no,[MyISAM MERGE Engine],
         [Merge multiple MySQL tables into one])
-MYSQL_PLUGIN_DIRECTORY(myisammrg,[storage/myisammrg])
 MYSQL_PLUGIN_STATIC(myisammrg,  [libmyisammrg_s.la], [libmyisammrg_embedded.la])
 MYSQL_PLUGIN_MANDATORY(myisammrg)
diff --git a/storage/mysql_storage_engine.cmake b/storage/mysql_storage_engine.cmake
index 07b4151c50c..b29ba961179 100644
--- a/storage/mysql_storage_engine.cmake
+++ b/storage/mysql_storage_engine.cmake
@@ -10,41 +10,41 @@
 # ${engine}_LIBS variable containing extra libraries to link with may be set
 
 
-MACRO(MYSQL_STORAGE_ENGINE engine)
+MACRO(MYSQL_PLUGIN engine)
 IF(NOT SOURCE_SUBLIBS)
   # Add common include directories
-  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
-                    ${CMAKE_SOURCE_DIR}/sql
-                    ${CMAKE_SOURCE_DIR}/regex
-                    ${CMAKE_SOURCE_DIR}/extra/yassl/include
-                    ${CMAKE_BINARY_DIR}/include
-                   ${CMAKE_BINARY_DIR}/sql
-  )
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include)
   STRING(TOUPPER ${engine} engine)
-  STRING(TOLOWER ${engine} libname)
   IF(${ENGINE_BUILD_TYPE} STREQUAL "STATIC")
-    ADD_DEFINITIONS(-DWITH_${engine}_STORAGE_ENGINE -DMYSQL_SERVER)
-    #Create static library. The name of the library is <storage_engine>.lib
-    ADD_LIBRARY(${libname} ${${engine}_SOURCES})
-    ADD_DEPENDENCIES(${libname} GenError)
+    ADD_LIBRARY(${${engine}_LIB} ${${engine}_SOURCES})
+    ADD_DEPENDENCIES(${${engine}_LIB} GenError)
     IF(${engine}_LIBS)
-      TARGET_LINK_LIBRARIES(${libname} ${${engine}_LIBS})
+      TARGET_LINK_LIBRARIES(${${engine}_LIB} ${${engine}_LIBS})
     ENDIF(${engine}_LIBS)
-    MESSAGE("build ${engine} as static library")
+    MESSAGE("build ${engine} as static library (${${engine}_LIB}.lib)")
   ELSEIF(${ENGINE_BUILD_TYPE} STREQUAL "DYNAMIC")
     ADD_DEFINITIONS(-DMYSQL_DYNAMIC_PLUGIN)
-    #Create a DLL.The name of the dll is ha_<storage_engine>.dll
-    #The dll is linked to the mysqld executable
-    SET(dyn_libname ha_${libname})
-    ADD_VERSION_INFO(${dyn_libname} SHARED ${engine}_SOURCES)
-    ADD_LIBRARY(${dyn_libname} MODULE ${${engine}_SOURCES})
-    TARGET_LINK_LIBRARIES (${dyn_libname}  mysqlservices mysqld)
+    ADD_VERSION_INFO(${${engine}_LIB} SHARED ${engine}_SOURCES)
+    ADD_LIBRARY(${${engine}_LIB} MODULE ${${engine}_SOURCES})
+    TARGET_LINK_LIBRARIES (${${engine}_LIB}  mysqlservices mysqld)
     IF(${engine}_LIBS)
-      TARGET_LINK_LIBRARIES(${dyn_libname} ${${engine}_LIBS})
+      TARGET_LINK_LIBRARIES(${${engine}_LIB} ${${engine}_LIBS})
     ENDIF(${engine}_LIBS)
     # Install the plugin
-    MYSQL_INSTALL_TARGETS(${dyn_libname} DESTINATION lib/plugin COMPONENT Server)
-    MESSAGE("build ${engine} as DLL")
+    MYSQL_INSTALL_TARGETS(${${engine}_LIB} DESTINATION lib/plugin COMPONENT Server)
+    MESSAGE("build ${engine} as DLL (${${engine}_LIB}.dll)")
+  ENDIF(${ENGINE_BUILD_TYPE} STREQUAL "STATIC")
+ENDIF(NOT SOURCE_SUBLIBS)
+ENDMACRO(MYSQL_PLUGIN)
+
+MACRO(MYSQL_STORAGE_ENGINE engine)
+IF(NOT SOURCE_SUBLIBS)
+  MYSQL_PLUGIN(${engine})
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/zlib ${CMAKE_SOURCE_DIR}/sql
+                      ${CMAKE_SOURCE_DIR}/regex ${CMAKE_BINARY_DIR}/sql
+                      ${CMAKE_SOURCE_DIR}/extra/yassl/include)
+  IF(${ENGINE_BUILD_TYPE} STREQUAL "STATIC")
+    ADD_DEFINITIONS(-DWITH_${engine}_STORAGE_ENGINE -DMYSQL_SERVER)
   ENDIF(${ENGINE_BUILD_TYPE} STREQUAL "STATIC")
 ENDIF(NOT SOURCE_SUBLIBS)
 ENDMACRO(MYSQL_STORAGE_ENGINE)
diff --git a/storage/ndb/plug.in b/storage/ndb/plug.in
index 3d3349f7a8b..d5f30d1e4b2 100644
--- a/storage/ndb/plug.in
+++ b/storage/ndb/plug.in
@@ -1,6 +1,5 @@
 MYSQL_STORAGE_ENGINE(ndbcluster, ndbcluster, [Cluster Storage Engine],
         [High Availability Clustered tables],)
-MYSQL_PLUGIN_DIRECTORY(ndbcluster,[storage/ndb])
 MYSQL_PLUGIN_STATIC(ndbcluster, [[\$(ndbcluster_libs) \$(ndbcluster_system_libs) \$(NDB_SCI_LIBS)]])
 MYSQL_PLUGIN_ACTIONS(ndbcluster,[MYSQL_SETUP_NDBCLUSTER])
 MYSQL_PLUGIN_DEPENDS(ndbcluster, [partition])
diff --git a/storage/pbxt/plug.in b/storage/pbxt/plug.in
index c0dc06d9702..2d79ad61b3a 100644
--- a/storage/pbxt/plug.in
+++ b/storage/pbxt/plug.in
@@ -1,6 +1,5 @@
 MYSQL_STORAGE_ENGINE(pbxt,no,  [PBXT Storage Engine],
         [MVCC-based transactional engine], [max,max-no-ndb])
-MYSQL_PLUGIN_DIRECTORY(pbxt, [storage/pbxt])
 MYSQL_PLUGIN_STATIC(pbxt,    [src/libpbxt_s.la], [src/libpbxt_s_embedded.la])
 MYSQL_PLUGIN_ACTIONS(pbxt,  [
 #               AC_CONFIG_FILES(storage/pbxt/src/Makefile)
diff --git a/storage/xtradb/CMakeLists.txt b/storage/xtradb/CMakeLists.txt
index 6e16c4ced32..8426804615d 100644
--- a/storage/xtradb/CMakeLists.txt
+++ b/storage/xtradb/CMakeLists.txt
@@ -13,7 +13,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-# This is the CMakeLists for InnoDB Plugin
+# This is the CMakeLists for XtraDB
+
+INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
 
 IF (CMAKE_SIZEOF_VOID_P MATCHES 8)
 	SET(WIN64 TRUE)
diff --git a/storage/xtradb/plug.in b/storage/xtradb/plug.in
index 2e0c873094a..1846543a81c 100644
--- a/storage/xtradb/plug.in
+++ b/storage/xtradb/plug.in
@@ -16,7 +16,6 @@
 
 MYSQL_STORAGE_ENGINE(xtradb,  xtradb, [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.la])
 MYSQL_PLUGIN_DYNAMIC(xtradb,  [ha_xtradb.la])
 MYSQL_PLUGIN_ACTIONS(xtradb,  [