diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2015-04-12 05:16:48 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2015-04-12 05:16:48 +0300 |
| commit | a445b83d73c18b64cfbf6256d8f6ae44d6c7356f (patch) | |
| tree | df86d9918ae64d635c5e3eade273f07b0aa91742 /libmysqld | |
| parent | 0719df781e5600bceeaaec0e97367f4420a491d0 (diff) | |
| parent | d214c83b5e50f17fd60e853272491c4312df1169 (diff) | |
| download | mariadb-git-a445b83d73c18b64cfbf6256d8f6ae44d6c7356f.tar.gz | |
Merge branch '10.1' of github.com:MariaDB/server into 10.1
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 3472ee85f2f..93ed96321d5 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -106,7 +106,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/compat56.cc ../sql/table_cache.cc ../sql/item_inetfunc.cc - ../sql/wsrep_dummy.cc ../sql/encryption_keys.cc + ../sql/wsrep_dummy.cc ../sql/encryption.cc ${GEN_SOURCES} ${MYSYS_LIBWRAP_SOURCE} ) |