summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_statement.cxx7
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_statement.hxx2
2 files changed, 5 insertions, 4 deletions
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx
index 3211fe09eff7..6b35b236361f 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx
@@ -50,11 +50,12 @@ OCommonStatement::OCommonStatement(OConnection* _pConnection)
OCommonStatement::~OCommonStatement() {}
-void OCommonStatement::disposeResultSet()
+void OCommonStatement::closeResultSet()
{
- // free the cursor if alive
if (m_xResultSet.is())
{
+ css::uno::Reference<css::sdbc::XCloseable> xClose(m_xResultSet, UNO_QUERY_THROW);
+ xClose->close();
m_xResultSet.clear();
m_pMysqlResult = nullptr; // it is freed by XResultSet
}
@@ -105,7 +106,7 @@ void SAL_CALL OCommonStatement::close()
checkDisposed(rBHelper.bDisposed);
}
dispose();
- disposeResultSet();
+ closeResultSet();
}
// void SAL_CALL OStatement::clearBatch()
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx
index 54d67bd9d901..9595c596401a 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx
@@ -71,7 +71,7 @@ protected:
sal_Int32 m_nAffectedRows = 0;
protected:
- void disposeResultSet();
+ void closeResultSet();
// OPropertyArrayUsageHelper
::cppu::IPropertyArrayHelper* createArrayHelper() const override;