connectivity/source/drivers/firebird/StatementCommonBase.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit bd5ef0f1ecb445021fc693bfd3cab0979a4c4c28
Author: Tamas Bunth <tamas.bu...@collabora.co.uk>
AuthorDate: Thu Jan 31 17:15:26 2019 +0100
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Thu Mar 14 21:24:42 2019 +0100
tdf#122129 Firebird: fix concurrency issue
Allow only one isc_dsql_prepare at a time.
Change-Id: I3d5974057272cd47697aeb7be54579d0c1a662a0
Reviewed-on: https://gerrit.libreoffice.org/67231
Tested-by: Jenkins
Reviewed-by: Tamás Bunth <btom...@gmail.com>
(cherry picked from commit 6affbd2b57a336749a6a2ab3466a4e652a7ff365)
Reviewed-on: https://gerrit.libreoffice.org/69227
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx
b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
index 03439c937c12..8d3c4b42abec 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
@@ -26,6 +26,7 @@
#include <comphelper/sequence.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <propertyids.hxx>
+#include <vcl/svapp.hxx>
#include <TConnection.hxx>
using namespace ::connectivity::firebird;
@@ -126,7 +127,7 @@ void
OStatementCommonBase::prepareAndDescribeStatement(const OUString& sql,
XSQLDA*& pOutSqlda,
XSQLDA* pInSqlda)
{
- MutexGuard aGuard(m_aMutex);
+ SolarMutexGuard g; // tdf#122129
freeStatementHandle();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
