diff options
author | Sergei Petrunia <psergey@askmonty.org> | 2014-10-15 17:21:59 +0400 |
---|---|---|
committer | Sergei Petrunia <psergey@askmonty.org> | 2014-10-15 17:21:59 +0400 |
commit | be1c17669cb90e18315d7675c8b4d3c906cd64a7 (patch) | |
tree | e4a0cddd284e813510666ec843344886a160a619 /libmysqld | |
parent | 041e03e251e783d51ca86e53112e3b87bd2da146 (diff) | |
parent | fec5ab5a56cb9a45c621207620cc85079cddf537 (diff) | |
download | mariadb-git-be1c17669cb90e18315d7675c8b4d3c906cd64a7.tar.gz |
Merge ../10.1 into bb-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 57a8fd830df..7dbc8cd70f5 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -106,6 +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 ${GEN_SOURCES} ${MYSYS_LIBWRAP_SOURCE} ) |