summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2019-02-12 23:19:43 -0800
committerIgor Babaev <igor@askmonty.org>2019-02-12 23:19:43 -0800
commit953ca199fb62bcd190d2af4d6177f986564ec1ad (patch)
tree0ee967694db2fe959eed2f4091ab18bf722436b7 /libmysqld
parent27c3abde3071ad2010cbcda5b07435ad15364a70 (diff)
parentbe8709eb7bdf2a68a1c04fd8ab368113f5f39b63 (diff)
downloadmariadb-git-953ca199fb62bcd190d2af4d6177f986564ec1ad.tar.gz
Merge branch '10.4' into bb-10.4-mdev17096
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 782d28afb70..3146529b6fc 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -123,6 +123,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
../sql/sql_tvc.cc ../sql/sql_tvc.h
../sql/opt_split.cc
../sql/item_vers.cc
+ ../sql/opt_trace.cc
${GEN_SOURCES}
${MYSYS_LIBWRAP_SOURCE}
)