[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-3' - connectivity/source

Wed Apr 1 08:46:41 UTC 2020

connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit bc6f350d17b9e80e66add73fb6743b16db320b2c
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Mon Mar 30 19:38:55 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed Apr 1 10:46:11 2020 +0200

    tdf#131712: fix crash on table with non null float field (mysql native)
    
    See bt with infinite loop here:
    http://bugs.documentfoundation.org/attachment.cgi?id=159161
    
    Change-Id: Iaa4e998c640c414dec60a72d5977f8d6a6a8433f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91379
    Tested-by: Jenkins
    (cherry picked from commit 192ee96db3bc3544c388034b19fa7a9cd6e7537d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91386
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    (cherry picked from commit 9e72262b420bad1e54287e35463be55769063608)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91394
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Tested-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
index ddaba5fc9e45..984914016a13 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
@@ -330,6 +330,7 @@ ORowSetValue OPreparedResultSet::getRowSetValue(sal_Int32 nColumnIndex)
         case MYSQL_TYPE_LONGLONG:
             return getLong(nColumnIndex);
         case MYSQL_TYPE_FLOAT:
+            return getFloat(nColumnIndex);
         case MYSQL_TYPE_DOUBLE:
             return getDouble(nColumnIndex);
         case MYSQL_TYPE_TIMESTAMP:
