diff --git a/configure.ac b/configure.ac
index 3f3d809..bcbaf54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8237,7 +8237,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
         fi
     else
         AC_MSG_RESULT([internal])
-        AC_MSG_ERROR([libmariadb is known to be broken as of 2013-10; use libmysqlclient])
+        #AC_MSG_ERROR([libmariadb is known to be broken as of 2013-10; use libmysqlclient])
         SYSTEM_MARIADB=NO
         MARIADB_CFLAGS="-I${WORKDIR}/UnpackedTarball/mariadb/include"
         MARIADB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lmariadblib"
diff --git a/dbaccess/qa/extras/testdocuments/testDialogSave.odb b/dbaccess/qa/extras/testdocuments/testDialogSave.odb
index d725312..c2de3d4 100644
Binary files a/dbaccess/qa/extras/testdocuments/testDialogSave.odb and b/dbaccess/qa/extras/testdocuments/testDialogSave.odb differ
diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk b/external/mysqlcppconn/Library_mysqlcppconn.mk
index eccc521..90892d2 100644
--- a/external/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/external/mysqlcppconn/Library_mysqlcppconn.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_defs,mysqlcppconn,\
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_add_libs,mysqlcppconn,\
-	-lpthread \
+	-lpthread -lssl -lcrypto \
 ))
 endif