branches/zip: merge the fix of bug#48317 (CMake file)

Due to MySQL changes to the CMake, it is no longer able
to build InnoDB plugin as a static library on Windows.
The fix is proposed by Vlad of MySQL.

CMakeLists.txt

@@ -83,12 +83,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)
 
 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)
+	MYSQL_STORAGE_ENGINE(INNOBASE)
+	# Use ha_innodb for plugin name, if plugin is built
+	GET_TARGET_PROPERTY(LIB_LOCATION ha_innobase LOCATION)
+	IF(LIB_LOCATION)
+		SET_TARGET_PROPERTIES(ha_innobase PROPERTIES OUTPUT_NAME ha_innodb)
+	ENDIF(LIB_LOCATION)
 ELSE (MYSQL_VERSION_ID GREATER "50137")
 	IF (NOT SOURCE_SUBLIBS)
 		ADD_DEFINITIONS(-D_WIN32 -DMYSQL_SERVER)