summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2016-03-21 11:46:03 -0700
committerIgor Babaev <igor@askmonty.org>2016-03-21 11:46:03 -0700
commit1fc2c63fb1ddc8622f370e59adeb2c512c7b7d63 (patch)
tree1aab7dc37457b2ee380fbabb488a6214b4f3d0ff /libmysqld
parentec0fb660d7ac9d62374926e0e3f025a48975e806 (diff)
parentf340aaeb52916d028a41ed771dfbbdd9dc4c3f88 (diff)
downloadmariadb-git-1fc2c63fb1ddc8622f370e59adeb2c512c7b7d63.tar.gz
Manual merge of branch 'bb-10.2-mdev8789' into 10.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 d4df327930d..2081e7558d5 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -109,6 +109,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
../sql/table_cache.cc ../sql/mf_iocache_encr.cc
../sql/item_inetfunc.cc
../sql/wsrep_dummy.cc ../sql/encryption.cc
+ ../sql/sql_cte.cc
${GEN_SOURCES}
${MYSYS_LIBWRAP_SOURCE}
)