configure.ac | 3 +--
connectivity/source/drivers/mysqlc/mysqlc_driver.hxx | 2 --
2 files changed, 1 insertion(+), 4 deletions(-)
New commits:
commit abee8ffe6494a53b7b584597ef13831518a59d18
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Aug 27 16:59:04 2018 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Aug 28 08:17:33 2018 +0200
SYSTEM_MYSQL_CPPCONN is never defined
...since 5061663ce052087c6d5d0910d6f99358e26dbbd1 "drop unnecessary
SYSTEM_MYSQL_CONNECTOR_CPP"
Change-Id: I2023baf04dfb050833a0032367fc2dc2cfdb9d92
Reviewed-on: https://gerrit.libreoffice.org/59670
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
b/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
index 89c57630823e..d0f7febf8d13 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
@@ -54,12 +54,10 @@ protected:
OWeakRefArray m_xConnections; // vector containing a list
// of all the Connection objects
// for this Driver
-#ifndef SYSTEM_MYSQL_CPPCONN
#ifdef BUNDLE_MARIADB
oslModule m_hCConnModule;
bool m_bAttemptedLoadCConn;
#endif
-#endif
public:
explicit MysqlCDriver(const Reference<css::lang::XMultiServiceFactory>&
_rxFactory);
commit 760111784eb014091a445b3c5c2d1ad7b1b1ded7
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Aug 27 13:36:06 2018 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Aug 28 08:17:22 2018 +0200
No space before period
...left there by 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1 "Moving mysqlc
into
connectivity as a library". (And remove latter half of sentence that
doesn't
make much sense anymore.)
Change-Id: Ic87bd243cfde61080e4afae14de5c3fe7c53824b
Reviewed-on: https://gerrit.libreoffice.org/59656
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 7ba6545c7ae5..a31b26c62ab9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1725,8 +1725,7 @@ AC_ARG_WITH(system-apache-commons,
AC_ARG_WITH(system-mariadb,
AS_HELP_STRING([--with-system-mariadb],
- [Use MariaDB/MySQL libraries already on system, for building the
MariaDB Connector/LibreOffice
- .]),,
+ [Use MariaDB/MySQL libraries already on system.]),,
[with_system_mariadb="$with_system_libs"])
AC_ARG_ENABLE(bundle-mariadb,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
