branches/zip: adjust CMake file to work with old versions of MySQL

Tested with MySQL 5.1.38 and 5.1.30.

CMakeLists.txt

@@ -18,7 +18,13 @@
 
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
-INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
+
+# Starting at 5.1.38, MySQL CMake files are simplified. But the plugin
+# CMakeLists.txt still needs to work with previous versions of MySQL.
+IF (MYSQL_VERSION_ID GREATER "50137")
+	INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
+ENDIF (MYSQL_VERSION_ID GREATER "50137")
+
 IF (CMAKE_SIZEOF_VOID_P MATCHES 8)
 	SET(WIN64 TRUE)
 ENDIF (CMAKE_SIZEOF_VOID_P MATCHES 8)
@@ -76,9 +82,18 @@ SET(INNOBASE_SOURCES	btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c
 			ut/ut0list.c ut/ut0wqueue.c)
 ADD_DEFINITIONS(-DHAVE_WINDOWS_ATOMICS -DIB_HAVE_PAUSE_INSTRUCTION)
 
-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)
\ No newline at end of file
+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")