diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-02-15 20:31:24 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-02-15 20:31:58 +0100 |
| commit | 28f18aa7a6bb0da125f0ba3cb9da3720fa620501 (patch) | |
| tree | 1b26e15e88c898170859d724b8afbe4b2a63f09b /libmysqld | |
| parent | a44f2c3ee88783a0f7fa535124a91a013860b021 (diff) | |
| parent | 62c0ac2da66f8e26d5bbf79f3a7dac56cad34f5e (diff) | |
| download | mariadb-git-28f18aa7a6bb0da125f0ba3cb9da3720fa620501.tar.gz | |
Merge branch '10.4' into bb-10.4-mdev16188bb-10.4-mdev16188
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 43b7fa80628..6bd3a59dd2f 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -110,6 +110,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/sql_analyze_stmt.cc ../sql/sql_analyze_stmt.h ../sql/compat56.cc ../sql/sql_type.cc ../sql/sql_type.h + ../sql/sql_type_json.cc ../sql/table_cache.cc ../sql/mf_iocache_encr.cc ../sql/item_inetfunc.cc ../sql/wsrep_dummy.cc ../sql/encryption.cc |