diff options
author | unknown <gkodinov/kgeorge@magare.gmz> | 2008-05-13 15:29:35 +0300 |
---|---|---|
committer | unknown <gkodinov/kgeorge@magare.gmz> | 2008-05-13 15:29:35 +0300 |
commit | b6fdf4d9568fd07a60557604a732968ee7d584e5 (patch) | |
tree | 010055313bd58b1d711eaa9f06ba6a71d327d8f7 | |
parent | f5fda859fd171ad2df0c893d6b078006ab09419a (diff) | |
parent | 534a45934e9142c05e70eabd79559de215e2b6e3 (diff) | |
download | mariadb-git-b6fdf4d9568fd07a60557604a732968ee7d584e5.tar.gz |
Merge bk-internal:/home/bk/mysql-5.1-bugteam
into magare.gmz:/home/kgeorge/mysql/work/win64-warn-5.1-bugteam
-rw-r--r-- | libmysqld/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 36b85acac85..97c718627d1 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -147,7 +147,7 @@ ENDIF(WITH_CSV_STORAGE_ENGINE) SET(SOURCE_SUBLIBS FALSE) -SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc event_parse_data.cc +SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.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 @@ -186,6 +186,7 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc event_parse_data.cc ../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc ../sql/partition_info.cc ../sql/sql_connect.cc ../sql/scheduler.cc ../sql/stacktrace.c + ../sql/event_parse_data.cc ${GEN_SOURCES} ${LIB_SOURCES}) |