fix C API includes

ColumnStore used to include server's mysql.h
but link all tools with libmariadb.so

There's no guarantee that this would work, even with workarounds
it had in dbcon/mysql/sm.cpp

Fix:
* tools (linked with libmariadb.so) *must* include libmariadb's mysql.h
* as a hack prevent service_thd_timezone.h from being loaded into tools,
  as it conflicts with libmariadb's mysql.h
* server plugin *must* include server's mysql.h
* also don't link every tool with libmariadb.so, link the helper library
  (liblibmysqlclient.so) that actually needs it, tools use this
  helper library, not libmariadb.so directly

dbcon/joblist/CMakeLists.txt

@@ -1,5 +1,13 @@
+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
     anydatalist.cpp
     batchprimitiveprocessor-jl.cpp
@@ -54,15 +62,8 @@ set(joblist_LIB_SRCS
     windowfunctionstep.cpp
     ${ENGINE_SRC_DIR}/tools/passwd/secrets.cpp)
 
-########### next target ###############
-
-add_library(joblist_server STATIC ${joblist_LIB_SRCS})
-
-########### 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})
 add_dependencies(joblist loggingcpp)
 
 install(TARGETS joblist DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

dbcon/mysql/sm.cpp

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