Bug#49834 - fixed a bug introduced by mismerge.

restore original innobase version
16 years ago · 0d0ff32c6e
1 changed files with 6 additions and 1 deletions
--- a/storage/innobase/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
@ -86,5 +86,10 @@ IF (MYSQL_VERSION_ID GREATER "50137")
 		SET_TARGET_PROPERTIES(ha_innobase PROPERTIES OUTPUT_NAME ha_innodb)
 	ENDIF(LIB_LOCATION)
 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")