mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '5.5' into 10.0

Browse source
This commit is contained in:
Sergei Golubchik 2015-06-11 20:20:35 +02:00
commit 810cf362ea
165 changed files with 3364 additions and 1399 deletions
Download patch file Download diff file Expand all files Collapse all files

46
storage/federatedx/README.windows
View file

@ -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)