diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-06-10 10:59:49 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-06-10 10:59:49 +0200 |
| commit | 31b79618e34a36ff24d2e1a6186258dc18e12aa5 (patch) | |
| tree | 41fa2696a71a46f4885a21cf7c58dc438a600d7a /storage/heap | |
| parent | 518e2498534cd996544238eb50d7e71da026ae19 (diff) | |
| download | mariadb-git-31b79618e34a36ff24d2e1a6186258dc18e12aa5.tar.gz | |
Backport WL#3653 to 5.1 to enable bundled innodb plugin.
Remove custom DLL loader code from innodb plugin code, use
symbols exported from mysqld.
Diffstat (limited to 'storage/heap')
| -rwxr-xr-x | storage/heap/CMakeLists.txt | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/storage/heap/CMakeLists.txt b/storage/heap/CMakeLists.txt index f8f0aa91464..c2d2cd1290f 100755 --- a/storage/heap/CMakeLists.txt +++ b/storage/heap/CMakeLists.txt @@ -16,18 +16,10 @@ 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_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib - ${CMAKE_SOURCE_DIR}/sql - ${CMAKE_SOURCE_DIR}/regex - ${CMAKE_SOURCE_DIR}/extra/yassl/include) - +INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake") SET(HEAP_SOURCES _check.c _rectest.c hp_block.c hp_clear.c hp_close.c hp_create.c ha_heap.cc hp_delete.c hp_extra.c hp_hash.c hp_info.c hp_open.c hp_panic.c hp_rename.c hp_rfirst.c hp_rkey.c hp_rlast.c hp_rnext.c hp_rprev.c hp_rrnd.c hp_rsame.c hp_scan.c hp_static.c hp_update.c hp_write.c) - -IF(NOT SOURCE_SUBLIBS) - ADD_LIBRARY(heap ${HEAP_SOURCES}) - ADD_DEPENDENCIES(heap GenError) -ENDIF(NOT SOURCE_SUBLIBS) +MYSQL_STORAGE_ENGINE(HEAP) |