diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2014-08-09 01:52:54 +0400 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2014-08-09 01:52:54 +0400 |
| commit | 83f0ddc6294ea8d4e424a540a043bf88ee4a8c8d (patch) | |
| tree | 04280aba1544710aac2a6971a8d86a41c11cbecc /libmysqld | |
| parent | d87ffeb49133aa459e134f09924cd7b7b5013632 (diff) | |
| parent | 5cfd3270ec79238b27765af3062ae7d97f6f06d0 (diff) | |
| download | mariadb-git-83f0ddc6294ea8d4e424a540a043bf88ee4a8c8d.tar.gz | |
Merge 10.1 (with ANALYZE) and 10.1-explain-json
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 0920be53baf..57a8fd830df 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 |