Skip to content

M
mariadb
Commit 804e9d30 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub
Browse files
Options

merge

parents ca1d4133 b1c355b3
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
storage/innobase/CMakeLists.txt
View file @ 804e9d30
...@@ -86,12 +86,12 @@ SET(INNOBASE_SOURCES btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c ...@@ -86,12 +86,12 @@ SET(INNOBASE_SOURCES btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c
ADD_DEFINITIONS(-DHAVE_WINDOWS_ATOMICS -DIB_HAVE_PAUSE_INSTRUCTION) ADD_DEFINITIONS(-DHAVE_WINDOWS_ATOMICS -DIB_HAVE_PAUSE_INSTRUCTION)
IF (MYSQL_VERSION_ID GREATER "50137") IF (MYSQL_VERSION_ID GREATER "50137")
IF (WITH_INNOBASE_STORAGE_ENGINE) MYSQL_STORAGE_ENGINE(INNOBASE)
MYSQL_STORAGE_ENGINE(INNOBASE) # Use ha_innodb for plugin name, if plugin is built
ELSE (WITH_INNOBASE_STORAGE_ENGINE) GET_TARGET_PROPERTY(LIB_LOCATION ha_innobase LOCATION)
SET (INNODB_SOURCES ${INNOBASE_SOURCES}) IF(LIB_LOCATION)
MYSQL_STORAGE_ENGINE(INNODB) SET_TARGET_PROPERTIES(ha_innobase PROPERTIES OUTPUT_NAME ha_innodb)
ENDIF (WITH_INNOBASE_STORAGE_ENGINE) ENDIF(LIB_LOCATION)
ELSE (MYSQL_VERSION_ID GREATER "50137") ELSE (MYSQL_VERSION_ID GREATER "50137")
IF (NOT SOURCE_SUBLIBS) IF (NOT SOURCE_SUBLIBS)
ADD_DEFINITIONS(-D_WIN32 -DMYSQL_SERVER) ADD_DEFINITIONS(-D_WIN32 -DMYSQL_SERVER)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7