connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx | 2 +- connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-)
New commits: commit 5ca8b9752c3afb8a688279aa2306c80ef34f1297 Author: Tamas Bunth <[email protected]> AuthorDate: Fri Aug 31 18:20:50 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Mon Sep 3 10:08:38 2018 +0200 mysqlc: implement beforeFirst and fix findColumn Change-Id: I9a12ef6c61b83f588be89ed9aff301d570155d74 Reviewed-on: https://gerrit.libreoffice.org/59881 Reviewed-by: Andras Timar <[email protected]> Tested-by: Andras Timar <[email protected]> diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx index 695f6973512e..dee5d091a353 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx @@ -118,7 +118,7 @@ sal_Int32 SAL_CALL OPreparedResultSet::findColumn(const rtl::OUString& columnNam MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedResultSet_BASE::rBHelper.bDisposed); - MYSQL_FIELD* pFields = mysql_fetch_field(m_pResult); + MYSQL_FIELD* pFields = mysql_fetch_fields(m_pResult); for (sal_Int32 i = 0; i < m_nFieldCount; ++i) { if (columnName.equalsIgnoreAsciiCaseAscii(pFields[i].name)) diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx index aa2f821fb868..9fa2f64613c0 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx @@ -142,7 +142,7 @@ sal_Int32 SAL_CALL OResultSet::findColumn(const rtl::OUString& columnName) MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - MYSQL_FIELD* pFields = mysql_fetch_field(m_pResult); + MYSQL_FIELD* pFields = mysql_fetch_fields(m_pResult); for (unsigned int i = 0; i < fieldCount; ++i) { if (columnName.equalsIgnoreAsciiCaseAscii(pFields[i].name)) @@ -541,8 +541,7 @@ void SAL_CALL OResultSet::beforeFirst() { MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - - mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::beforeFirst", *this); + mysql_data_seek(m_pResult, 0); } void SAL_CALL OResultSet::afterLast() _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
