[Libreoffice-commits] core.git: connectivity/source
Lionel Elie Mamane
lionel at mamane.lu
Mon Oct 9 06:54:05 UTC 2017
connectivity/source/drivers/odbc/OResultSet.cxx | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 2399cf59fc0467028e7183877582821dc878120f
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Mon Oct 9 08:53:13 2017 +0200
Revert "Related tdf#112947: another fix about odbc"
Since the buffer pointed to by SQL_ATTR_FETCH_BOOKMARK_PTR is not free()/delete()ed by the destructor of OResultSet, this is not the right place to unregister it.
This reverts commit b76a087f73cdf3d1a8bcc56b1ed7a5959ca0f1bd.
Change-Id: I78e162c0ced1a15decc4a0f464c99f68fcac7ce5
Reviewed-on: https://gerrit.libreoffice.org/43270
Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
Tested-by: Lionel Elie Mamane <lionel at mamane.lu>
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 97768116d1e9..7a74762a30c0 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -164,7 +164,6 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) :
OResultSet::~OResultSet()
{
- setStmtOption<SQLLEN*, SQL_IS_POINTER>(SQL_ATTR_FETCH_BOOKMARK_PTR, nullptr);
setStmtOption<SQLUSMALLINT*, SQL_IS_POINTER>(SQL_ATTR_ROW_STATUS_PTR, nullptr);
}
More information about the Libreoffice-commits
mailing list