commit 6d38c3088532959e1d7ffd4e4714b5ad39b02685
author Julien Nabet <serval2412@yahoo.fr> Thu Jan 17 09:11:02 2019 +0100
committer Caolán McNamara <caolanm@redhat.com> Tue Jan 22 09:52:46 2019 +0100
tree 34b1950ebf0c46e8dae41a75b9897f7104fa770f
parent 7c104f8ae8c1571f4653f85e7a284ee5e3743304

tdf#122516: fix timestamp in MariaDb/mysql

Change-Id: I9740e265c7f4c607bf871c5f12df149355ce6a61
Reviewed-on: https://gerrit.libreoffice.org/66671
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

connectivity/source/drivers/mysqlc/mysqlc_general.cxx

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
index aa0b0a9..f5b20cb 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
@@ -210,7 +210,7 @@
        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;