Skip to content

M
MariaDB
Commit 13d5d2f7 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub
Browse files
Options

Bug#49834 - fixed a bug introduced by mismerge. 

restore original innobase version
parent a96c22fe
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
storage/innobase/CMakeLists.txt
View file @ 13d5d2f7
...@@ -86,5 +86,10 @@ IF (MYSQL_VERSION_ID GREATER "50137") ...@@ -86,5 +86,10 @@ IF (MYSQL_VERSION_ID GREATER "50137")
SET_TARGET_PROPERTIES(ha_innobase PROPERTIES OUTPUT_NAME ha_innodb) SET_TARGET_PROPERTIES(ha_innobase PROPERTIES OUTPUT_NAME ha_innodb)
ENDIF(LIB_LOCATION) ENDIF(LIB_LOCATION)
ELSE (MYSQL_VERSION_ID GREATER "50137") ELSE (MYSQL_VERSION_ID GREATER "50137")
MYSQL_STORAGE_ENGINE(INNODB_PLUGIN) IF (NOT SOURCE_SUBLIBS)
ADD_DEFINITIONS(-D_WIN32 -DMYSQL_SERVER)
ADD_LIBRARY(innobase STATIC ${INNOBASE_SOURCES})
# Require mysqld_error.h, which is built as part of the GenError
ADD_DEPENDENCIES(innobase GenError)
ENDIF (NOT SOURCE_SUBLIBS)
ENDIF (MYSQL_VERSION_ID GREATER "50137") ENDIF (MYSQL_VERSION_ID GREATER "50137")
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