connectivity/source/drivers/mysqlc/mysqlc_general.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6d38c3088532959e1d7ffd4e4714b5ad39b02685
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Thu Jan 17 09:11:02 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jan 22 09:52:46 2019 +0100
tdf#122516: fix timestamp in MariaDb/mysql
Change-Id: I9740e265c7f4c607bf871c5f12df149355ce6a61
Reviewed-on: https://gerrit.libreoffice.org/66671
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
index aa0b0a9e4e5a..f5b20cb55715 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 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
