diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-08-04 13:25:19 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-08-04 13:25:19 +0200 |
| commit | c5ab943afef478af26ca0e0af20664c7d2cd5e46 (patch) | |
| tree | 32be2bfec3ca062c65566c60ecf59b673d1f97e9 /storage/blackhole | |
| parent | 605b5fd23279d3a9070bb663497895e89c37df9e (diff) | |
| parent | 01dbe984f8987e6f198b8b31175c4c68e7072c49 (diff) | |
| download | mariadb-git-c5ab943afef478af26ca0e0af20664c7d2cd5e46.tar.gz | |
Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:
bzr branch mysql-5.1-performance-version mysql-trunk # Summit
cd mysql-trunk
bzr merge mysql-5.1-innodb_plugin # which is 5.1 + Innodb plugin
bzr rm innobase # remove the builtin
Next step: build, test fixes.
Diffstat (limited to 'storage/blackhole')
| -rw-r--r-- | storage/blackhole/CMakeLists.txt | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/storage/blackhole/CMakeLists.txt b/storage/blackhole/CMakeLists.txt index b11330db255..b762228d7fd 100644 --- a/storage/blackhole/CMakeLists.txt +++ b/storage/blackhole/CMakeLists.txt @@ -16,13 +16,7 @@ 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}/sql - ${CMAKE_SOURCE_DIR}/regex - ${CMAKE_SOURCE_DIR}/extra/yassl/include) - +INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake") SET(BLACKHOLE_SOURCES ha_blackhole.cc ha_blackhole.h) -IF(NOT SOURCE_SUBLIBS) - ADD_LIBRARY(blackhole ${BLACKHOLE_SOURCES}) - ADD_DEPENDENCIES(blackhole GenError) -ENDIF(NOT SOURCE_SUBLIBS) +MYSQL_STORAGE_ENGINE(BLACKHOLE) |