diff options
| author | Satya B <satya.bn@sun.com> | 2009-12-01 17:37:56 +0530 |
|---|---|---|
| committer | Satya B <satya.bn@sun.com> | 2009-12-01 17:37:56 +0530 |
| commit | a5b6f69396bc3c9658cdf0f250195a0018fbbe6b (patch) | |
| tree | 2803e7bd65bf8e029310304be8c14acc12d8961e /storage/innodb_plugin | |
| parent | 0b7c514e1e5bd2c04454902e41a94c4c5c1a9ead (diff) | |
| download | mariadb-git-a5b6f69396bc3c9658cdf0f250195a0018fbbe6b.tar.gz | |
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.
Diffstat (limited to 'storage/innodb_plugin')
| -rw-r--r-- | storage/innodb_plugin/CMakeLists.txt | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/storage/innodb_plugin/CMakeLists.txt b/storage/innodb_plugin/CMakeLists.txt index 21d83ea2b5f..ad483779152 100644 --- a/storage/innodb_plugin/CMakeLists.txt +++ b/storage/innodb_plugin/CMakeLists.txt @@ -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) |