diff options
| author | unknown <brian@zim.(none)> | 2006-08-25 14:07:30 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-08-25 14:07:30 -0700 |
| commit | 788496778bac45c71236546e470256358ede3570 (patch) | |
| tree | f2bea38f12b4ec4b52b8886dacb59249b306d9f7 /CMakeLists.txt | |
| parent | c8a98610187d789bb8e316823cc881016a715694 (diff) | |
| parent | 3c68ccd7142c23970c8a103108028d2fe93d9cbd (diff) | |
| download | mariadb-git-788496778bac45c71236546e470256358ede3570.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/home/brian/mysql/arch-5.1
BUILD/compile-alpha-cxx:
Auto merged
BUILD/compile-alpha-debug:
Auto merged
BUILD/compile-dist:
Auto merged
BUILD/compile-ia64-debug-max:
Auto merged
CMakeLists.txt:
Auto merged
client/mysql.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
BUILD/FINISH.sh:
Innodbase config still needed.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 30742d444ab..9814b80793c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,6 +136,9 @@ ENDIF(WITH_CSV_STORAGE_ENGINE) IF(WITH_EXAMPLE_STORAGE_ENGINE) ADD_SUBDIRECTORY(storage/example) ENDIF(WITH_EXAMPLE_STORAGE_ENGINE) +IF(WITH_FEDERATED_STORAGE_ENGINE) + ADD_SUBDIRECTORY(storage/federated) +ENDIF(WITH_FEDERATED_STORAGE_ENGINE) IF(WITH_INNOBASE_STORAGE_ENGINE) ADD_SUBDIRECTORY(storage/innobase) ENDIF(WITH_INNOBASE_STORAGE_ENGINE) |