summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorgkodinov/kgeorge@magare.gmz <>2008-05-12 19:35:08 +0300
committergkodinov/kgeorge@magare.gmz <>2008-05-12 19:35:08 +0300
commitcc2a2173143cf013a249f8039a7bacbf5a2c6ff4 (patch)
treee04a7334a22436fd5c4303b353cdd6e9d55c288a /libmysqld
parent459a35cce1a9ccdca2c8242d96ab381cbe47d356 (diff)
parentf1ad66e6c08a84a90c7ad1ded51ad39d62a5ef05 (diff)
downloadmariadb-git-cc2a2173143cf013a249f8039a7bacbf5a2c6ff4.tar.gz
Merge bk-internal:/home/bk/mysql-5.1-bugteam
into magare.gmz:/home/kgeorge/mysql/work/fixes-5.1-bugteam
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/CMakeLists.txt6
1 files changed, 2 insertions, 4 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index fb7b214bf60..36b85acac85 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -147,14 +147,12 @@ ENDIF(WITH_CSV_STORAGE_ENGINE)
SET(SOURCE_SUBLIBS FALSE)
-SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
+SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc event_parse_data.cc
../libmysql/libmysql.c ../libmysql/errmsg.c ../client/get_password.c
../sql-common/client.c ../sql-common/my_time.c
../sql-common/my_user.c ../sql-common/pack.c
../sql/password.c ../sql/discover.cc ../sql/derror.cc
- ../sql/event_scheduler.cc ../sql/events.cc
- ../sql/event_data_objects.cc ../sql/event_queue.cc
- ../sql/event_db_repository.cc ../sql/field.cc ../sql/field_conv.cc
+ ../sql/field.cc ../sql/field_conv.cc
../sql/filesort.cc ../sql/gstream.cc ../sql/ha_partition.cc
../sql/handler.cc ../sql/hash_filo.cc ../sql/hostname.cc
../sql/init.cc ../sql/item_buff.cc ../sql/item_cmpfunc.cc