diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-12-03 11:37:26 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-12-03 11:37:26 +0100 |
| commit | ec4137c62b00a2bad91dd108f5782b206fe86a8b (patch) | |
| tree | b284d929d1a498df14aafffd0c31831f2b4e9fd5 /libmysqld | |
| parent | 1caee393076dc642a7d8e1283377b59ef8f52dbd (diff) | |
| parent | bafe529af76a915f43dbf6a3fb8dc610a4ea121b (diff) | |
| download | mariadb-git-ec4137c62b00a2bad91dd108f5782b206fe86a8b.tar.gz | |
Merge branch '10.1' into bb-10.1-merge
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index f44c5daa17c..7dbc8cd70f5 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -100,6 +100,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/rpl_reporting.cc ../sql/sql_expression_cache.cc ../sql/my_apc.cc ../sql/my_apc.h + ../sql/my_json_writer.cc ../sql/my_json_writer.h ../sql/rpl_gtid.cc ../sql/sql_explain.cc ../sql/sql_explain.h ../sql/compat56.cc |