summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-02-21 01:58:50 +0200
committerMichael Widenius <monty@askmonty.org>2012-02-21 01:58:50 +0200
commit15c5a2686f6367d5a280813ad96ef86bd0ee0fc0 (patch)
treea1e008c4e92b63efa9cea54ed5ab837fa2b7e229 /libmysqld
parent84a3767c1912c34e79cde72a51e4cf69d235587e (diff)
parent522b289607ce10ff3e44fdf8035ae1c29bffe4f4 (diff)
downloadmariadb-git-15c5a2686f6367d5a280813ad96ef86bd0ee0fc0.tar.gz
Merge with MariaDB 5.2
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index 12b33e6092b..a57f36d4f54 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -104,6 +104,7 @@ SET(LIBMYSQLD_SOURCES libmysqld.c emb_qcache.cc lib_sql.cc
../sql/password.c ../sql/discover.cc ../sql/derror.cc
../sql/field.cc ../sql/field_conv.cc ../sql-common/client_plugin.c
../sql/filesort.cc ../sql/gstream.cc ../sql/ha_partition.cc
+ ../sql/signal_handler.cc
../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 ../sql/item_func.cc