List:Commits« Previous MessageNext Message »
From:Vladislav Vaintroub Date:December 21 2009 2:58pm
Subject:bzr commit into mysql-5.5-next-mr-bugfixing branch (vvaintroub:2944)
Bug#47705 Bug#49834
View as plain text  
#At file:///H:/bzr/mysql-next-mr-bugfixing/ based on revid:mattias.jonsson@stripped

 2944 Vladislav Vaintroub	2009-12-21
      Bug#49834 - fixed a bug introduced by mismerge.
      Remove version checks and 2 incompatible MYSQL_STORAGE_ENGINE()
      Currently, a single CMakeLists.txt cannot have more that 1 MYSQL_STORAGE_ENGINE()
      with different engines, due to Bug#47705

    modified:
      storage/innobase/CMakeLists.txt
=== modified file 'storage/innobase/CMakeLists.txt'
--- a/storage/innobase/CMakeLists.txt	2009-12-19 08:38:14 +0000
+++ b/storage/innobase/CMakeLists.txt	2009-12-21 14:58:33 +0000
@@ -17,9 +17,9 @@
 
 # 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")
+
+INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
+
 
 IF (CMAKE_SIZEOF_VOID_P MATCHES 8)
 	SET(WIN64 TRUE)
@@ -78,13 +78,11 @@ SET(INNOBASE_SOURCES	btr/btr0btr.c btr/b
 			ut/ut0list.c ut/ut0wqueue.c)
 ADD_DEFINITIONS(-DHAVE_WINDOWS_ATOMICS -DIB_HAVE_PAUSE_INSTRUCTION)
 
-IF (MYSQL_VERSION_ID GREATER "50137")
-	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")
-	MYSQL_STORAGE_ENGINE(INNODB_PLUGIN)
-ENDIF (MYSQL_VERSION_ID GREATER "50137")
+
+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)
+


Attachment: [text/bzr-bundle] bzr/vvaintroub@mysql.com-20091221145833-ax28an5vic7ychxi.bundle
Thread
bzr commit into mysql-5.5-next-mr-bugfixing branch (vvaintroub:2944)Bug#47705 Bug#49834Vladislav Vaintroub21 Dec