Merge branch '2.0.1' into develop

2016-10-03 15:21:04 +03:00
parent b42231e5d4 fa2a667195
commit fbf5c331f1
16 changed files with 449 additions and 301 deletions
--- a/query_classifier/qc_mysqlembedded/CMakeLists.txt
+++ b/query_classifier/qc_mysqlembedded/CMakeLists.txt
@ -15,4 +15,5 @@ if (BUILD_QC_MYSQLEMBEDDED)
  set_target_properties(qc_mysqlembedded PROPERTIES LINK_FLAGS -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/qc_mysqlembedded.map)
  #set_target_properties(qc_mysqlembedded PROPERTIES LINK_FLAGS -Wl,-z,defs)
  install_module(qc_mysqlembedded libmysqld-parser)
+  install(PROGRAMS ${ERRMSG} DESTINATION ${MAXSCALE_VARDIR}/lib/maxscale)
 endif()