diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-08-03 22:19:12 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-08-03 22:19:12 +0200 |
| commit | 916f5e1ed858a6962d0586243a15e34b8ab4af89 (patch) | |
| tree | 794f4d045a5970c8379adbdfca5bdfb655348d46 /libmysqld | |
| parent | 51f3e0049f3d79150e69141679fc9acabc0facfe (diff) | |
| parent | cb6a28aaf9acbaca39ff1ebc983f2b1058a4f585 (diff) | |
| download | mariadb-git-916f5e1ed858a6962d0586243a15e34b8ab4af89.tar.gz | |
Merge XtraDB 6 with latest MariaDB 5.1
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 5b22fd07e26..7f311844c6a 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -132,9 +132,9 @@ IF(WITH_FEDERATED_STORAGE_ENGINE) ENDIF(WITH_FEDERATED_STORAGE_ENGINE) IF(WITH_INNOBASE_STORAGE_ENGINE) - INCLUDE(${CMAKE_SOURCE_DIR}/storage/innobase/CMakeLists.txt) + INCLUDE(${CMAKE_SOURCE_DIR}/storage/xtradb/CMakeLists.txt) FOREACH(rpath ${INNOBASE_SOURCES}) - SET(LIB_SOURCES ${LIB_SOURCES} ../storage/innobase/${rpath}) + SET(LIB_SOURCES ${LIB_SOURCES} ../storage/xtradb/${rpath}) ENDFOREACH(rpath) ENDIF(WITH_INNOBASE_STORAGE_ENGINE) |