Merge from mysql-trunk-merge.

storage/innobase/CMakeLists.txt

@@ -84,4 +84,20 @@ SET(INNOBASE_SOURCES	btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c
 			ut/ut0byte.c ut/ut0dbg.c ut/ut0mem.c ut/ut0rnd.c ut/ut0ut.c ut/ut0vec.c
 			ut/ut0list.c ut/ut0wqueue.c)
 ADD_DEFINITIONS(-DHAVE_WINDOWS_ATOMICS -DIB_HAVE_PAUSE_INSTRUCTION)
+
+IF (MYSQL_VERSION_ID GREATER "50137")
+	IF (WITH_INNOBASE_STORAGE_ENGINE)
+		MYSQL_STORAGE_ENGINE(INNOBASE)
+	ELSE (WITH_INNOBASE_STORAGE_ENGINE)
+		SET (INNODB_SOURCES ${INNOBASE_SOURCES})
+		MYSQL_STORAGE_ENGINE(INNODB)
+	ENDIF (WITH_INNOBASE_STORAGE_ENGINE)
+ELSE (MYSQL_VERSION_ID GREATER "50137")
+	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")
 MYSQL_STORAGE_ENGINE(INNOBASE)