Merge branch '2.2' into develop

2018-02-08 18:40:29 +02:00
parent 5326c8db5c 5a33a5a013
commit fcde23e6fe
14 changed files with 190 additions and 67 deletions
--- a/server/modules/protocol/MySQL/CMakeLists.txt
+++ b/server/modules/protocol/MySQL/CMakeLists.txt
@ -5,4 +5,7 @@ install_module(mysqlcommon core)

 add_subdirectory(mariadbbackend)
 add_subdirectory(mariadbclient)
-add_subdirectory(test)
+
+if (BUILD_TESTS)
+  add_subdirectory(test)
+endif()