Addition to Innodb Plugin 1.0.6 snapshot
the last IF ELSE part which decides the plugin name is not relevant as we still have to substitute the occurences of INNOBASE with INNODB_PLUGIN. Remove the last IF ELSE part in CMakeLists.txt as it doesn't make sense in 5.1.
This commit is contained in:
parent
0b7c514e1e
commit
a5b6f69396
@ -81,14 +81,4 @@ SET(INNODB_PLUGIN_SOURCES btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea
|
||||
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")
|
||||
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)
|
||||
MYSQL_STORAGE_ENGINE(INNOBASE)
|
||||
|
Loading…
x
Reference in New Issue
Block a user