Merge pull request #2630 from dhall-MariaDB/sergchanges

Sergchanges

dbcon/joblist/CMakeLists.txt

@@ -1,11 +1,4 @@
-include_directories(BEFORE
-    ${CMAKE_BINARY_DIR}/libmariadb/include
-    ${CMAKE_SOURCE_DIR}/libmariadb/include)
-add_definitions(-DMYSQL_SERVICE_THD_TIMEZONE_INCLUDED)
-
 include_directories( ${ENGINE_COMMON_INCLUDES} ${ENGINE_SRC_DIR}/tools/passwd)
-
-
 ########### next target ###############
 
 set(joblist_LIB_SRCS
@@ -62,8 +55,19 @@ set(joblist_LIB_SRCS
     windowfunctionstep.cpp
     ${ENGINE_SRC_DIR}/tools/passwd/secrets.cpp)
 
+########### next target ###############
+
+add_library(joblist_server STATIC ${joblist_LIB_SRCS})
+add_dependencies(joblist_server loggingcpp)
+
+########### next target ###############
+
+add_definitions(-DMYSQL_SERVICE_THD_TIMEZONE_INCLUDED)
+
 add_library(joblist SHARED ${joblist_LIB_SRCS})
-target_include_directories(joblist BEFORE PUBLIC ${OPENSSL_INCLUDE_DIR})
+target_include_directories(joblist BEFORE PUBLIC ${OPENSSL_INCLUDE_DIR}
+  ${CMAKE_BINARY_DIR}/libmariadb/include
+  ${CMAKE_SOURCE_DIR}/libmariadb/include)
 add_dependencies(joblist loggingcpp)
 
 install(TARGETS joblist DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

dbcon/mysql/CMakeLists.txt

@@ -11,6 +11,8 @@ SET(S3API_DEPS marias3 curl CACHE INTERNAL "S3API_DEPS")
 
 SET ( libcalmysql_SRCS
     ../../datatypes/mcs_datatype.cpp
+    ../../utils/libmysql_client/libmysql_client.cpp
+    ../../utils/querystats/querystats.cpp
     ha_mcs_sysvars.cpp
     ha_mcs_client_udfs.cpp
     ha_mcs_opt_rewrites.cpp
@@ -45,7 +47,7 @@ if (COMMAND mysql_add_plugin)
   ENDIF()
 
   mysql_add_plugin(columnstore ${libcalmysql_SRCS} STORAGE_ENGINE MODULE_ONLY ${disabled}
-      LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${S3API_DEPS} threadpool
+      LINK_LIBRARIES ${ENGINE_LDFLAGS} ${PLUGIN_EXEC_LIBS} ${PLUGIN_WRITE_LIBS} joblist_server ${NETSNMP_LIBRARIES} ${S3API_DEPS} threadpool
       VERSION ${PACKAGE_VERSION}
       COMPONENT columnstore-engine CONFIG columnstore.cnf)
 else ()

dbcon/mysql/sm.cpp

@@ -506,5 +506,4 @@ void cpsm_conhdl_t::write(ByteStream bs)
 #endif
 }
 
-}  // namespace sm
-
+}