[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - connectivity/source

[Libreoffice Gerrit user]

 connectivity/source/drivers/mysqlc/mysqlc_general.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5f43079cdb1933a0f68f9266c98ebb2c110d294e
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Thu Jan 17 09:11:02 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Jan 22 16:39:24 2019 +0100

    tdf#122516: fix timestamp in MariaDb/mysql
    
    Change-Id: I9740e265c7f4c607bf871c5f12df149355ce6a61
    Reviewed-on: https://gerrit.libreoffice.org/66495
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Jenkins
    Reviewed-on: https://gerrit.libreoffice.org/66728
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
index c77eab4674f3..ea5342ff5b38 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
@@ -210,7 +210,7 @@ sal_Int32 mysqlStrToOOOType(const rtl::OUString& sType)
         return css::sdbc::DataType::TIME;
     if (sType.equalsIgnoreAsciiCase("date"))
         return css::sdbc::DataType::DATE;
-    if (sType.equalsIgnoreAsciiCase("datetime"))
+    if (sType.equalsIgnoreAsciiCase("datetime") || sType.equalsIgnoreAsciiCase("timestamp"))
         return css::sdbc::DataType::TIMESTAMP;
     if (sType.equalsIgnoreAsciiCase("decimal"))
         return css::sdbc::DataType::DECIMAL;