diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-09-16 01:20:58 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-09-16 01:20:58 +0400 |
| commit | 3d60f05f984433ae60ba1e8fec5e4196b4cb5c07 (patch) | |
| tree | c2014fe5c0fb3b04c2e746afe11e7944d1475b04 /CMakeLists.txt | |
| parent | e8d7e27fedf9db7e9143fe8eb2b6560696a1fea8 (diff) | |
| download | mariadb-git-3d60f05f984433ae60ba1e8fec5e4196b4cb5c07.tar.gz | |
MySQL 5.1 -> Maria 5.1 merge: Fix windows build
- Fix XtraDB to be built as a static library.
storage/xtradb/buf/buf0flu.c:
Fix previous merge error (was harmless except for on win32)
storage/xtradb/plug.in:
Make it sync with innobase/plug.in.disabled
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 67a04aee309..edc0dff8310 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -225,6 +225,14 @@ FOREACH(SUBDIR ${STORAGE_SUBDIRS}) STRING (REGEX MATCH "MYSQL_PLUGIN_DYNAMIC" MYSQL_PLUGIN_DYNAMIC ${PLUGIN_FILE_CONTENT}) STRING (REGEX MATCH "MYSQL_PLUGIN_MANDATORY" MYSQL_PLUGIN_MANDATORY ${PLUGIN_FILE_CONTENT}) STRING (REGEX MATCH "MYSQL_PLUGIN_STATIC" MYSQL_PLUGIN_STATIC ${PLUGIN_FILE_CONTENT}) + + # + # XTRADB is located in storage/xtradb, but it says everywhere it is 'innobase' (e.g. + # it declares 'builtin_innobase_plugin', not builtin_xtradb_plugin). + # Extract the intended plugin name from MYSQL_STORAGE_ENGINE definition and use it + # where appropriate. + STRING (REGEX MATCH "MYSQL_STORAGE_ENGINE.[a-z]*" PLUGIN_NAME ${PLUGIN_FILE_CONTENT}) + STRING (REGEX REPLACE "MYSQL_STORAGE_ENGINE.(.*)" "\\1" PLUGIN_NAME ${PLUGIN_NAME}) IF(MYSQL_PLUGIN_MANDATORY) SET(WITH_${ENGINE}_STORAGE_ENGINE TRUE) @@ -238,8 +246,8 @@ FOREACH(SUBDIR ${STORAGE_SUBDIRS}) SET(ENGINE_BUILD_TYPE "NONE") ENDIF(WITH_${ENGINE}_STORAGE_ENGINE AND MYSQL_PLUGIN_STATIC) IF (ENGINE_BUILD_TYPE STREQUAL "STATIC") - SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_${ENGINE_LOWER}_plugin") - SET (MYSQLD_STATIC_ENGINE_LIBS ${MYSQLD_STATIC_ENGINE_LIBS} ${ENGINE_LOWER}) + SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_${PLUGIN_NAME}_plugin") + SET (MYSQLD_STATIC_ENGINE_LIBS ${MYSQLD_STATIC_ENGINE_LIBS} ${PLUGIN_NAME}) SET (STORAGE_ENGINE_DEFS "${STORAGE_ENGINE_DEFS} -DWITH_${ENGINE}_STORAGE_ENGINE") SET (WITH_${ENGINE}_STORAGE_ENGINE TRUE) ENDIF (ENGINE_BUILD_TYPE STREQUAL "STATIC") |