diff options
| author | brian@zim.(none) <> | 2006-08-25 14:07:30 -0700 |
|---|---|---|
| committer | brian@zim.(none) <> | 2006-08-25 14:07:30 -0700 |
| commit | 7216b5bc7a64533634b234f521ee8ce9bf7c9417 (patch) | |
| tree | f2bea38f12b4ec4b52b8886dacb59249b306d9f7 /libmysqld | |
| parent | 257ce16d58c5f375ca026cf05f97d5ded77851eb (diff) | |
| parent | e831273902da0af8d48eab4b76a7c77a06fbc1aa (diff) | |
| download | mariadb-git-7216b5bc7a64533634b234f521ee8ce9bf7c9417.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/home/brian/mysql/arch-5.1
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | libmysqld/Makefile.am | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 804ab4ad3f2..d752d905568 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -30,8 +30,7 @@ ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc ../sql-common/pack.c ../sql/derror.cc ../sql/event_scheduler.cc ../sql/event_timed.cc ../sql/events.cc ../sql/discover.cc ../sql/field_conv.cc ../sql/field.cc ../sql/filesort.cc - ../sql/gstream.cc ../sql/ha_heap.cc ../sql/ha_myisam.cc - ../sql/ha_myisammrg.cc ${mysql_se_ha_src} + ../sql/gstream.cc ${mysql_se_ha_src} ../sql/handler.cc ../sql/hash_filo.cc ../sql/hostname.cc ../sql/init.cc ../sql/item_buff.cc ../sql/item_cmpfunc.cc ../sql/item.cc ../sql/item_create.cc @@ -80,6 +79,9 @@ ENDIF(WITH_ARCHIVE_STORAGE_ENGINE) IF(WITH_EXAMPLE_STORAGE_ENGINE) ADD_DEPENDENCIES(mysqlserver example) ENDIF(WITH_EXAMPLE_STORAGE_ENGINE) +IF(WITH_FEDERATED_STORAGE_ENGINE) + ADD_DEPENDENCIES(mysqlserver federated) +ENDIF(WITH_FEDERATED_STORAGE_ENGINE) IF(WITH_INNOBASE_STORAGE_ENGINE) ADD_DEPENDENCIES(mysqlserver innobase) ENDIF(WITH_INNOBASE_STORAGE_ENGINE) diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 9e85c46575d..e6d1c1acfca 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -44,8 +44,7 @@ libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \ noinst_HEADERS = embedded_priv.h emb_qcache.h sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ - ha_heap.cc ha_myisam.cc ha_myisammrg.cc \ - ha_innodb.cc ha_federated.cc ha_ndbcluster.cc \ + ha_innodb.cc ha_ndbcluster.cc \ ha_ndbcluster_binlog.cc ha_partition.cc \ handler.cc sql_handler.cc \ hostname.cc init.cc password.c \ |