diff --git a/cmake/BuildLibmariadb.cmake b/cmake/BuildLibmariadb.cmake
index a1a1c2c6..33455a65 100644
--- a/cmake/BuildLibmariadb.cmake
+++ b/cmake/BuildLibmariadb.cmake
@@ -41,7 +41,7 @@ list(APPEND  _EXTRA_CMAKE_ARGS
 ENDIF()
 
 set(LIBMARIADB_GIT_TAG
-    v3.3.11
+    v3.4.2
     CACHE
       STRING
       "Git tag of mariadb client library. Set to empty string to get most recent revision"
diff --git a/src/drivers/mysql/drv_mysql.c b/src/drivers/mysql/drv_mysql.c
index 15e53538..7443f836 100644
--- a/src/drivers/mysql/drv_mysql.c
+++ b/src/drivers/mysql/drv_mysql.c
@@ -403,6 +403,11 @@ static int mysql_drv_real_connect(db_mysql_conn_t *db_mysql_con)
 #ifdef HAVE_MYSQL_OPT_SSL_MODE
   DEBUG("mysql_options(%p,%s,%d)", con, "MYSQL_OPT_SSL_MODE", args.ssl_mode);
   mysql_options(con, MYSQL_OPT_SSL_MODE, &args.ssl_mode);
+#else
+  char bool_opt = 0;
+  mysql_options(con, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &bool_opt);
+  bool_opt = args.use_ssl;
+  mysql_options(con, MYSQL_OPT_SSL_ENFORCE, &bool_opt);
 #endif
 
   if (args.use_ssl)