diff options
| author | Igor Babaev <igor@askmonty.org> | 2019-02-14 22:07:33 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2019-02-14 22:07:33 -0800 |
| commit | 98d55b1366746a2b4750da9e8781f66b0d01ed85 (patch) | |
| tree | ff062a3ec4e6a760d5c45e9db4f1fd292cfadbbe /libmysqld | |
| parent | ccce4d3be9bb5dfce66576f9744bcb927b754cf4 (diff) | |
| parent | 282ba973e748456a829eecf1b49fb352870c6a8f (diff) | |
| download | mariadb-git-98d55b1366746a2b4750da9e8781f66b0d01ed85.tar.gz | |
Merge branch '10.4' into bb-10.4-mdev16188
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index bf277e9ad20..43b7fa80628 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -78,7 +78,8 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/debug_sync.cc ../sql/opt_table_elimination.cc ../sql/sql_prepare.cc ../sql/sql_rename.cc ../sql/sql_repl.cc ../sql/sql_select.cc ../sql/sql_servers.cc - ../sql/group_by_handler.cc + ../sql/group_by_handler.cc ../sql/derived_handler.cc + ../sql/select_handler.cc ../sql/sql_show.cc ../sql/sql_state.c ../sql/sql_statistics.cc ../sql/sql_string.cc ../sql/sql_tablespace.cc ../sql/sql_table.cc ../sql/sql_test.cc @@ -123,6 +124,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/opt_split.cc ../sql/rowid_filter.cc ../sql/rowid_filter.h ../sql/item_vers.cc + ../sql/opt_trace.cc ${GEN_SOURCES} ${MYSYS_LIBWRAP_SOURCE} ) |