Serg`s patch for develop-6 revised for develop mariadb-corporation#2614

dbcon/joblist/CMakeLists.txt

@@ -1,3 +1,7 @@
+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)
 
@@ -66,7 +70,7 @@ install(TARGETS joblist DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engin
 
 if (WITH_ORDERBY_UT)
     add_executable(job_orderby_tests orderby-tests.cpp)
-    target_link_libraries(job_orderby_tests ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${CPPUNIT_LIBRARIES} cppunit)
+    target_link_libraries(job_orderby_tests ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${CPPUNIT_LIBRARIES} cppunit)
     install(TARGETS job_orderby_tests DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
 endif()
 

dbcon/mysql/sm.cpp

@@ -508,67 +508,3 @@ void cpsm_conhdl_t::write(ByteStream bs)
 
 }  // namespace sm
 
-/**
- * The following functions exist because QueryStats is used by sm.
- * QueryStats needs to use a MariaDB client connection and has to use the
- * server's built-in client which doesn't have the same API as the general
- * MariaDB client.
- * These functions reproduce the missing functionality.
- * Everywhere else QueryStats is linked to uses the general MariaDB API so
- * these functions aren't needed.
- */
-
-unsigned long mysql_real_escape_string(MYSQL* mysql, char* to, const char* from, unsigned long length)
-{
-  my_bool overflow;
-  return escape_string_for_mysql(mysql->charset, to, length * 2 + 1, from, length, &overflow);
-}
-
-// Clone of sql-common/client.c cli_use_result
-MYSQL_RES* mysql_use_result(MYSQL* mysql)
-{
-  MYSQL_RES* result;
-  DBUG_ENTER("mysql_use_result (clone)");
-
-  if (!mysql->fields)
-    DBUG_RETURN(0);
-
-  if (mysql->status != MYSQL_STATUS_GET_RESULT)
-  {
-    set_mysql_error(mysql, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate);
-    DBUG_RETURN(0);
-  }
-
-  if (!(result =
-            (MYSQL_RES*)my_malloc(PSI_NOT_INSTRUMENTED, sizeof(*result) + sizeof(ulong) * mysql->field_count,
-                                  MYF(MY_WME | MY_ZEROFILL))))
-    DBUG_RETURN(0);
-
-  result->lengths = (ulong*)(result + 1);
-  result->methods = mysql->methods;
-
-  if (!(result->row = (MYSQL_ROW)my_malloc(PSI_NOT_INSTRUMENTED,
-                                           sizeof(result->row[0]) * (mysql->field_count + 1), MYF(MY_WME))))
-  {
-    /* Ptrs: to one row */
-    my_free(result);
-    DBUG_RETURN(0);
-  }
-
-  result->fields = mysql->fields;
-  result->field_alloc = mysql->field_alloc;
-  result->field_count = mysql->field_count;
-  result->current_field = 0;
-  result->handle = mysql;
-  result->current_row = 0;
-  mysql->fields = 0; /* fields is now in result */
-  clear_alloc_root(&mysql->field_alloc);
-  mysql->status = MYSQL_STATUS_USE_RESULT;
-  mysql->unbuffered_fetch_owner = &result->unbuffered_fetch_cancelled;
-  DBUG_RETURN(result); /* Data is read to be fetched */
-}
-
-MYSQL_FIELD* mysql_fetch_fields(MYSQL_RES* res)
-{
-  return res->fields;
-}

ddlproc/CMakeLists.txt

@@ -10,7 +10,7 @@ add_executable(DDLProc ${DDLProc_SRCS})
 
 add_dependencies(DDLProc loggingcpp)
 
-target_link_libraries(DDLProc ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool)
+target_link_libraries(DDLProc ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool)
 
 install(TARGETS DDLProc DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
 

dmlproc/CMakeLists.txt

@@ -15,7 +15,7 @@ add_executable(DMLProc ${DMLProc_SRCS})
 
 add_dependencies(DMLProc loggingcpp)
 
-target_link_libraries(DMLProc ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool ddlcleanuputil batchloader)
+target_link_libraries(DMLProc ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool ddlcleanuputil batchloader)
 
 install(TARGETS DMLProc DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
 

oamapps/columnstoreDB/CMakeLists.txt

@@ -8,7 +8,7 @@ set(columnstoreDBWrite_SRCS columnstoreDB.cpp)
 
 add_executable(columnstoreDBWrite ${columnstoreDBWrite_SRCS})
 
-target_link_libraries(columnstoreDBWrite ${ENGINE_LDFLAGS} ncurses  ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
+target_link_libraries(columnstoreDBWrite ${ENGINE_LDFLAGS} ncurses  ${ENGINE_EXEC_LIBS})
 
 install(TARGETS columnstoreDBWrite DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
 

oamapps/columnstoreSupport/CMakeLists.txt

@@ -10,7 +10,7 @@ add_executable(columnstoreSupport ${columnstoreSupport_SRCS})
 
 target_compile_options(columnstoreSupport PRIVATE -Wno-unused-result)
 
-target_link_libraries(columnstoreSupport ${ENGINE_LDFLAGS} ncurses  ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
+target_link_libraries(columnstoreSupport ${ENGINE_LDFLAGS} ncurses  ${ENGINE_EXEC_LIBS})
 
 install(TARGETS columnstoreSupport DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
 

oamapps/postConfigure/CMakeLists.txt

@@ -10,7 +10,7 @@ add_executable(mycnfUpgrade ${mycnfUpgrade_SRCS})
 
 target_compile_options(mycnfUpgrade PRIVATE -Wno-unused-result)
 
-target_link_libraries(mycnfUpgrade ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
+target_link_libraries(mycnfUpgrade ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${ENGINE_EXEC_LIBS})
 
 install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
 

primitives/primproc/CMakeLists.txt

@@ -30,6 +30,6 @@ add_executable(PrimProc ${PrimProc_SRCS})
 
 add_dependencies(PrimProc loggingcpp)
 target_include_directories(PrimProc PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(PrimProc ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} threadpool cacheutils dbbc processor)
+target_link_libraries(PrimProc ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS} threadpool cacheutils dbbc processor)
 
 install(TARGETS PrimProc DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

storage-manager/CMakeLists.txt

@@ -105,28 +105,28 @@ add_executable(smcat src/smcat.cpp)
 target_link_libraries(smcat storagemanager cloudio
     ${ENGINE_LDFLAGS}
     ${ENGINE_EXEC_LIBS}
-    ${MARIADB_CLIENT_LIBS}
+
 )
 
 add_executable(smput src/smput.cpp)
 target_link_libraries(smput storagemanager cloudio
     ${ENGINE_LDFLAGS}
     ${ENGINE_EXEC_LIBS}
-    ${MARIADB_CLIENT_LIBS}
+
 )
 
 add_executable(smls src/smls.cpp)
 target_link_libraries(smls storagemanager cloudio
     ${ENGINE_LDFLAGS}
     ${ENGINE_EXEC_LIBS}
-    ${MARIADB_CLIENT_LIBS}
+
 )
 
 add_executable(smrm src/smrm.cpp)
 target_link_libraries(smrm storagemanager cloudio
     ${ENGINE_LDFLAGS}
     ${ENGINE_EXEC_LIBS}
-    ${MARIADB_CLIENT_LIBS}
+
 )
 
 install(TARGETS storagemanager

tests/CMakeLists.txt

@@ -1,7 +1,7 @@
 include_directories( ${ENGINE_COMMON_INCLUDES} ${ENGINE_BLOCKCACHE_INCLUDE} ${ENGINE_PRIMPROC_INCLUDE} )
-cmake_policy(SET CMP0054 NEW)
 
 if (WITH_UNITTESTS)
+    cmake_policy(SET CMP0054 NEW)
     set(EXTERNAL_INSTALL_LOCATION ${CMAKE_BINARY_DIR}/external)
     ExternalProject_Add(googletest
         GIT_REPOSITORY https://github.com/google/googletest
@@ -25,53 +25,53 @@ if (WITH_UNITTESTS)
     #GoogleTest tests
     add_executable(rowgroup_tests rowgroup-tests.cpp)
     add_dependencies(rowgroup_tests googletest)
-    target_link_libraries(rowgroup_tests ${ENGINE_LDFLAGS} ${GTEST_LIBRARIES} ${ENGINE_EXEC_LIBS} ${MARIADB_CLIENT_LIBS})
+    target_link_libraries(rowgroup_tests ${ENGINE_LDFLAGS} ${GTEST_LIBRARIES} ${ENGINE_EXEC_LIBS})
     gtest_add_tests(TARGET rowgroup_tests TEST_PREFIX columnstore:)
 
     add_executable(mcs_decimal_tests mcs_decimal-tests.cpp)
     add_dependencies(mcs_decimal_tests googletest)
-    target_link_libraries(mcs_decimal_tests ${ENGINE_LDFLAGS} ${GTEST_LIBRARIES} ${ENGINE_EXEC_LIBS} ${MARIADB_CLIENT_LIBS})
+    target_link_libraries(mcs_decimal_tests ${ENGINE_LDFLAGS} ${GTEST_LIBRARIES} ${ENGINE_EXEC_LIBS})
     gtest_add_tests(TARGET mcs_decimal_tests TEST_PREFIX columnstore:)
 
     add_executable(dataconvert_tests dataconvert-tests.cpp)
     add_dependencies(dataconvert_tests googletest)
-    target_link_libraries(dataconvert_tests ${ENGINE_LDFLAGS} ${GTEST_LIBRARIES} ${ENGINE_EXEC_LIBS} ${MARIADB_CLIENT_LIBS})
+    target_link_libraries(dataconvert_tests ${ENGINE_LDFLAGS} ${GTEST_LIBRARIES} ${ENGINE_EXEC_LIBS})
     gtest_add_tests(TARGET dataconvert_tests TEST_PREFIX columnstore:)
 
     add_executable(rebuild_em_tests rebuild-em-tests.cpp)
     add_dependencies(rebuild_em_tests googletest)
-    target_link_libraries(rebuild_em_tests ${ENGINE_LDFLAGS} ${GTEST_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS})
+    target_link_libraries(rebuild_em_tests ${ENGINE_LDFLAGS} ${GTEST_LIBRARIES} ${ENGINE_WRITE_LIBS})
     gtest_add_tests(TARGET rebuild_em_tests TEST_PREFIX columnstore:)
 
     add_executable(compression_tests compression-tests.cpp)
     add_dependencies(compression_tests googletest)
-    target_link_libraries(compression_tests ${ENGINE_LDFLAGS} ${GTEST_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS})
+    target_link_libraries(compression_tests ${ENGINE_LDFLAGS} ${GTEST_LIBRARIES} ${ENGINE_WRITE_LIBS})
     gtest_add_tests(TARGET compression_tests TEST_PREFIX columnstore:)
 
     add_executable(column_scan_filter_tests primitives_column_scan_and_filter.cpp)
     target_compile_options(column_scan_filter_tests PRIVATE -Wno-error -Wno-sign-compare)
     add_dependencies(column_scan_filter_tests googletest)
-    target_link_libraries(column_scan_filter_tests ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${GTEST_LIBRARIES} processor dbbc)
+    target_link_libraries(column_scan_filter_tests ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${GTEST_LIBRARIES} processor dbbc)
     gtest_add_tests(TARGET column_scan_filter_tests TEST_PREFIX columnstore:)
 
     add_executable(simd_processors simd_processors.cpp)
     target_compile_options(simd_processors PRIVATE -Wno-error)
     add_dependencies(simd_processors googletest)
-    target_link_libraries(simd_processors ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${GTEST_LIBRARIES} processor dbbc)
+    target_link_libraries(simd_processors ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${GTEST_LIBRARIES} processor dbbc)
     gtest_add_tests(TARGET simd_processors TEST_PREFIX columnstore:)
 
     add_executable(fair_threadpool_test fair_threadpool.cpp)
     add_dependencies(fair_threadpool_test googletest)
-    target_link_libraries(fair_threadpool_test ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${GTEST_LIBRARIES} processor dbbc)
+    target_link_libraries(fair_threadpool_test ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${GTEST_LIBRARIES} processor dbbc)
     gtest_add_tests(TARGET fair_threadpool_test TEST_PREFIX columnstore:)
 
     add_executable(comparators_tests comparators-tests.cpp)
-    target_link_libraries(comparators_tests ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${CPPUNIT_LIBRARIES} cppunit)
+    target_link_libraries(comparators_tests ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${CPPUNIT_LIBRARIES} cppunit)
     add_test(NAME columnstore:comparators_tests COMMAND comparators_tests)
 
     # standalone EM routines test
     add_executable(brm_em_standalone brm-em-standalone.cpp)
-    target_link_libraries(brm_em_standalone ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${CPPUNIT_LIBRARIES} cppunit)
+    target_link_libraries(brm_em_standalone ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${CPPUNIT_LIBRARIES} cppunit)
     add_test(NAME columnstore:brm_em_standalone COMMAND brm_em_standalone)
     set_tests_properties(columnstore:brm_em_standalone PROPERTIES DISABLED True)
 endif()
@@ -80,7 +80,7 @@ if (WITH_MICROBENCHMARKS AND (NOT CMAKE_BUILD_TYPE STREQUAL "Debug"))
     find_package(benchmark REQUIRED)
     add_executable(primitives_scan_bench primitives_scan_bench.cpp)
     target_include_directories(primitives_scan_bench PUBLIC ${ENGINE_COMMON_INCLUDES} ${ENGINE_BLOCKCACHE_INCLUDE} ${ENGINE_PRIMPROC_INCLUDE} )
-    target_link_libraries(primitives_scan_bench ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${GTEST_LIBRARIES} processor dbbc benchmark::benchmark)
+    target_link_libraries(primitives_scan_bench ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${GTEST_LIBRARIES} processor dbbc benchmark::benchmark)
     add_test(NAME columnstore_microbenchmarks:primitives_scan_bench, COMMAND primitives_scan_bench)
 endif()
 

tools/clearShm/CMakeLists.txt

@@ -8,7 +8,7 @@ set(clearShm_SRCS main.cpp)
 
 add_executable(clearShm ${clearShm_SRCS})
 
-target_link_libraries(clearShm ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
+target_link_libraries(clearShm ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS})
 
 install(TARGETS clearShm DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
 

tools/cleartablelock/CMakeLists.txt

@@ -8,7 +8,7 @@ set(cleartablelock_SRCS cleartablelock.cpp cleartablelockthread.cpp)
 
 add_executable(cleartablelock ${cleartablelock_SRCS})
 
-target_link_libraries(cleartablelock ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS})
+target_link_libraries(cleartablelock ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS})
 
 install(TARGETS cleartablelock DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
 

tools/configMgt/CMakeLists.txt

@@ -8,6 +8,6 @@ set(autoConfigure_SRCS autoConfigure.cpp)
 
 add_executable(autoConfigure ${autoConfigure_SRCS})
 
-target_link_libraries(autoConfigure ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
+target_link_libraries(autoConfigure ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_EXEC_LIBS})
 
 #install(TARGETS autoConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

tools/cplogger/CMakeLists.txt

@@ -8,7 +8,7 @@ set(cplogger_SRCS main.cpp)
 
 add_executable(cplogger ${cplogger_SRCS})
 
-target_link_libraries(cplogger ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
+target_link_libraries(cplogger ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS})
 
 install(TARGETS cplogger DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
 

tools/dbbuilder/CMakeLists.txt

@@ -8,7 +8,7 @@ set(dbbuilder_SRCS dbbuilder.cpp systemcatalog.cpp)
 
 add_executable(dbbuilder ${dbbuilder_SRCS})
 
-target_link_libraries(dbbuilder ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS})
+target_link_libraries(dbbuilder ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS})
 
 install(TARGETS dbbuilder DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
 

tools/dbloadxml/CMakeLists.txt

@@ -15,7 +15,7 @@ set(colxml_SRCS colxml.cpp)
 
 add_executable(colxml ${colxml_SRCS})
 
-target_link_libraries(colxml ${ENGINE_LDFLAGS} dbload ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS})
+target_link_libraries(colxml ${ENGINE_LDFLAGS} dbload ${ENGINE_WRITE_LIBS})
 
 install(TARGETS colxml DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
 

tools/ddlcleanup/CMakeLists.txt

@@ -8,7 +8,7 @@ set(ddlcleanup_SRCS ddlcleanup.cpp)
 
 add_executable(ddlcleanup ${ddlcleanup_SRCS})
 
-target_link_libraries(ddlcleanup ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ddlcleanuputil)
+target_link_libraries(ddlcleanup ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS} ddlcleanuputil)
 
 install(TARGETS ddlcleanup DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
 

tools/editem/CMakeLists.txt

@@ -8,7 +8,7 @@ set(editem_SRCS editem.cpp)
 
 add_executable(editem ${editem_SRCS})
 
-target_link_libraries(editem ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
+target_link_libraries(editem ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_EXEC_LIBS})
 
 install(TARGETS editem DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
 

tools/getConfig/CMakeLists.txt

@@ -8,7 +8,7 @@ set(getConfig_SRCS main.cpp)
 
 add_executable(mcsGetConfig ${getConfig_SRCS})
 
-target_link_libraries(mcsGetConfig ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
+target_link_libraries(mcsGetConfig ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS})
 
 install(TARGETS mcsGetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
 

tools/passwd/CMakeLists.txt

@@ -10,8 +10,8 @@ add_executable(cskeys ${cskeys_SRCS})
 
 target_include_directories(cspasswd BEFORE PUBLIC ${OPENSSL_INCLUDE_DIR})
 target_include_directories(cskeys BEFORE PUBLIC ${OPENSSL_INCLUDE_DIR})
-target_link_libraries(cspasswd ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS} ${SSL_LIBRARIES})
-target_link_libraries(cskeys ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS} ${SSL_LIBRARIES})
+target_link_libraries(cspasswd ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${SSL_LIBRARIES})
+target_link_libraries(cskeys ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${SSL_LIBRARIES})
 
 install(TARGETS cspasswd DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
 install(TARGETS cskeys DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

tools/rebuildEM/CMakeLists.txt

@@ -2,5 +2,5 @@ include_directories(${ENGINE_COMMON_INCLUDES})
 
 set(rebuildEM_SRCS main.cpp rebuildEM.cpp)
 add_executable(mcsRebuildEM ${rebuildEM_SRCS})
-target_link_libraries(mcsRebuildEM ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${MARIADB_CLIENT_LIBS} boost_system boost_filesystem)
+target_link_libraries(mcsRebuildEM ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} boost_system boost_filesystem)
 install(TARGETS mcsRebuildEM DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

tools/rgprint/CMakeLists.txt

@@ -8,7 +8,7 @@ set(rgprint_SRCS rgprint.cpp)
 
 add_executable(rgprint ${rgprint_SRCS})
 
-target_link_libraries(rgprint ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS})
+target_link_libraries(rgprint ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS})
 
 install(TARGETS rgprint DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
 

tools/setConfig/CMakeLists.txt

@@ -7,7 +7,7 @@ set(setConfig_SRCS main.cpp)
 
 add_executable(mcsSetConfig ${setConfig_SRCS})
 
-target_link_libraries(mcsSetConfig ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
+target_link_libraries(mcsSetConfig ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_EXEC_LIBS})
 
 install(TARGETS mcsSetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
 

tools/viewtablelock/CMakeLists.txt

@@ -8,7 +8,7 @@ set(viewtablelock_SRCS viewtablelock.cpp)
 
 add_executable(viewtablelock ${viewtablelock_SRCS})
 
-target_link_libraries(viewtablelock ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
+target_link_libraries(viewtablelock ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS})
 
 install(TARGETS viewtablelock DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
 

utils/cloudio/CMakeLists.txt

@@ -21,8 +21,8 @@ add_executable(end_to_end_test end_to_end_test.cpp)
 # untangle all of that and declare lib dependencies properly.
 # For now I'm going to do like the other executables, which means
 # nearly everything AFAICT.
-target_link_libraries(cloudio_component_test ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${MARIADB_CLIENT_LIBS} cloudio)
-target_link_libraries(end_to_end_test ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${MARIADB_CLIENT_LIBS} cloudio)
+target_link_libraries(cloudio_component_test ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} cloudio)
+target_link_libraries(end_to_end_test ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} cloudio)
 #target_link_libraries(cloudio_component_test cloudio)
 # Copy end_to_end_test dataFile to binary directory
 FILE(COPY testData DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)