From 8e7d6652adda0eaa0ce095b5c2258d5be61487fd Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 2 Jun 2015 22:07:47 +0200 Subject: CRLF->LF --- storage/federatedx/CMakeLists.txt | 8 +++---- storage/federatedx/README.windows | 46 +++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 27 deletions(-) (limited to 'storage/federatedx') diff --git a/storage/federatedx/CMakeLists.txt b/storage/federatedx/CMakeLists.txt index 24d64585ddb..67b6c1c96bb 100644 --- a/storage/federatedx/CMakeLists.txt +++ b/storage/federatedx/CMakeLists.txt @@ -1,4 +1,4 @@ -SET(FEDERATEDX_PLUGIN_STATIC "federatedx") -SET(FEDERATEDX_PLUGIN_DYNAMIC "ha_federatedx") -SET(FEDERATEDX_SOURCES ha_federatedx.cc federatedx_txn.cc federatedx_io.cc federatedx_io_null.cc federatedx_io_mysql.cc) -MYSQL_ADD_PLUGIN(federatedx ${FEDERATEDX_SOURCES} STORAGE_ENGINE) +SET(FEDERATEDX_PLUGIN_STATIC "federatedx") +SET(FEDERATEDX_PLUGIN_DYNAMIC "ha_federatedx") +SET(FEDERATEDX_SOURCES ha_federatedx.cc federatedx_txn.cc federatedx_io.cc federatedx_io_null.cc federatedx_io_mysql.cc) +MYSQL_ADD_PLUGIN(federatedx ${FEDERATEDX_SOURCES} STORAGE_ENGINE) diff --git a/storage/federatedx/README.windows b/storage/federatedx/README.windows index 3f1f2a3c79a..74de15c6521 100644 --- a/storage/federatedx/README.windows +++ b/storage/federatedx/README.windows @@ -1,23 +1,23 @@ -The following files are changed in order to build a new engine on Windows: - -- Update win\configure.js with -case "WITH_FEDERATEDX_STORAGE_ENGINE": -to make sure it will pass WITH_FEDERATEDX_STORAGE_ENGINE in. - -- Update CMakeFiles.txt under mysql root: - IF(WITH_FEDERATEDX_STORAGE_ENGINE) - ADD_DEFINITIONS(-D WITH_FEDERATEDX_STORAGE_ENGINE) - SET (mysql_plugin_defs - "${mysql_plugin_defs},builtin_skeleton_plugin") - ENDIF(WITH_FEDERATEDX_STORAGE_ENGINE) - - and, - - IF(WITH_FEDERATEDX_STORAGE_ENGINE) - ADD_SUBDIRECTORY(storage/skeleton/src) - ENDIF(WITH_FEDERATEDX_STORAGE_ENGINE) - - - Update CMakeFiles.txt under sql: - IF(WITH_FEDERATEDX_STORAGE_ENGINE) - TARGET_LINK_LIBRARIES(mysqld skeleton) - ENDIF(WITH_FEDERATEDX_STORAGE_ENGINE) +The following files are changed in order to build a new engine on Windows: + +- Update win\configure.js with +case "WITH_FEDERATEDX_STORAGE_ENGINE": +to make sure it will pass WITH_FEDERATEDX_STORAGE_ENGINE in. + +- Update CMakeFiles.txt under mysql root: + IF(WITH_FEDERATEDX_STORAGE_ENGINE) + ADD_DEFINITIONS(-D WITH_FEDERATEDX_STORAGE_ENGINE) + SET (mysql_plugin_defs + "${mysql_plugin_defs},builtin_skeleton_plugin") + ENDIF(WITH_FEDERATEDX_STORAGE_ENGINE) + + and, + + IF(WITH_FEDERATEDX_STORAGE_ENGINE) + ADD_SUBDIRECTORY(storage/skeleton/src) + ENDIF(WITH_FEDERATEDX_STORAGE_ENGINE) + + - Update CMakeFiles.txt under sql: + IF(WITH_FEDERATEDX_STORAGE_ENGINE) + TARGET_LINK_LIBRARIES(mysqld skeleton) + ENDIF(WITH_FEDERATEDX_STORAGE_ENGINE) -- cgit v1.2.1