summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-02-20 17:49:21 +0200
committerMichael Widenius <monty@askmonty.org>2012-02-20 17:49:21 +0200
commit038b739c98009cf0b4b7b7c2c18421051abf79f2 (patch)
treec31b05bf35b15358f7b0a89cfd8b5b43e2901ad8 /libmysqld
parent3c07d04580fe5f28ff8bdabd1249b8123d7da76b (diff)
parentae07ec6cbf08e311e538f5149f93385e5bcaa7a6 (diff)
downloadmariadb-git-038b739c98009cf0b4b7b7c2c18421051abf79f2.tar.gz
Merge with MariaDB 5.1 and MySQL 5.1.61
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 c4ca3d62afe..64debbecea1 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