diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2008-12-10 10:02:25 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2008-12-10 10:02:25 +0100 |
| commit | 926aaf4635c16f64d46d4fcbbbefb3aefca7a601 (patch) | |
| tree | dca0acd2a01c113582c29effe5312d2ffc0fb398 /libmysqld | |
| parent | ba816c14a9bc8012759da9d58f858f1e73bec708 (diff) | |
| parent | 7f91cf0861fb4e318b973c0fe1a2e632e9b587ea (diff) | |
| download | mariadb-git-926aaf4635c16f64d46d4fcbbbefb3aefca7a601.tar.gz | |
Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, mysys/mf_keycache.c, mysql-test/t/*myisam*
since previous merge. MARIA_PAGECACHE_READS in maria-preload.test are down a little bit (5%), which must be a good
side-effect of some sql/ change.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 1582f0898d8..ee08721b27c 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -145,6 +145,13 @@ IF(WITH_CSV_STORAGE_ENGINE) ENDFOREACH(rpath) ENDIF(WITH_CSV_STORAGE_ENGINE) +IF(WITH_MARIA_STORAGE_ENGINE) + INCLUDE(${CMAKE_SOURCE_DIR}/storage/maria/CMakeLists.txt) + FOREACH(rpath ${MARIA_SOURCES}) + SET(LIB_SOURCES ${LIB_SOURCES} ../storage/maria/${rpath}) + ENDFOREACH(rpath) +ENDIF(WITH_MARIA_STORAGE_ENGINE) + SET(SOURCE_SUBLIBS FALSE) SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc |