diff options
author | Igor Babaev <igor@askmonty.org> | 2012-12-16 21:33:17 -0800 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2012-12-16 21:33:17 -0800 |
commit | 1b62f0f58c7c5219143b6a87b89b1fa15e2be401 (patch) | |
tree | 29446273b907c6a46ce222c3c1aec0a4ebf60d32 /libmysqld | |
parent | 7760efad74140680b1eefaf2172b0fa26f7b1146 (diff) | |
parent | e44253a125c3baf7ea448edce77389810425df2a (diff) | |
download | mariadb-git-1b62f0f58c7c5219143b6a87b89b1fa15e2be401.tar.gz |
Merge maria-5.5-mwl248 -> 10.0-base.
Diffstat (limited to 'libmysqld')
-rw-r--r-- | libmysqld/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index aeb193ec83c..38d5b4d8fb3 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -74,7 +74,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/sql_show.cc ../sql/sql_state.c ../sql/sql_string.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 ../sql/sql_trigger.cc ../sql/sql_udf.cc ../sql/sql_union.cc ../sql/sql_update.cc ../sql/sql_view.cc ../sql/sql_profile.cc |