From: Markus Koschany <apo@debian.org>
Date: Fri, 9 Nov 2018 22:06:15 +0000 (+0100)
Subject: [PATCH] mariadb
X-Git-Tag: archive/raspbian/1%6.4.5_rc1-2+rpi1^2~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=22ec0b27def0abf5a3ec5c7c9e6541cdabc3cbbe;p=libreoffice.git

[PATCH] mariadb


Gbp-Pq: Name use-mariadb-java-instead-of-mysql-java.diff
---

diff --git a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
index 3817add48da..ace57bd35d9 100644
--- a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
+++ b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
@@ -64,7 +64,7 @@ public class JdbcLongVarCharTest extends ComplexTestCase
             */
             String url = System.getenv("CONNECTIVITY_TEST_MYSQL_DRIVER_JDBC");
             com.sun.star.beans.PropertyValue prop[] = new PropertyValue[1];
-            prop[0] = new PropertyValue("JavaDriverClass", 0, "com.mysql.jdbc.Driver", PropertyState.DIRECT_VALUE);
+            prop[0] = new PropertyValue("JavaDriverClass", 0, "org.mariadb.jdbc.Driver", PropertyState.DIRECT_VALUE);
 
             // get the remote office component context
             XMultiServiceFactory xServiceManager = param.getMSF();
diff --git a/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
index a4e95b04fe9..4238690ef3d 100644
--- a/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -33,7 +33,7 @@
         </node>
         <node oor:name="JavaDriverClass" oor:op="replace">
           <prop oor:name="Value" oor:type="xs:string">
-            <value>com.mysql.jdbc.Driver</value>
+            <value>org.mariadb.jdbc.Driver</value>
           </prop>
         </node>
         <node oor:name="AddIndexAppendix" oor:op="replace">
diff --git a/connectivity/source/drivers/mysql_jdbc/YDriver.cxx b/connectivity/source/drivers/mysql_jdbc/YDriver.cxx
index de6c0fdab81..7b3cf327792 100644
--- a/connectivity/source/drivers/mysql_jdbc/YDriver.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YDriver.cxx
@@ -55,7 +55,7 @@ namespace
 OUString getJavaDriverClass(css::uno::Sequence<css::beans::PropertyValue> const& info)
 {
     return comphelper::NamedValueCollection(info).getOrDefault("JavaDriverClass",
-                                                               OUString("com.mysql.jdbc.Driver"));
+                                                               OUString("org.mariadb.jdbc.Driver"));
 }
 }
 
@@ -169,7 +169,7 @@ Sequence<PropertyValue> lcl_convertProperties(T_DRIVERTYPE _eType,
         if (!jdc)
         {
             aProps.push_back(PropertyValue("JavaDriverClass", 0,
-                                           makeAny(OUString("com.mysql.jdbc.Driver")),
+                                           makeAny(OUString("org.mariadb.jdbc.Driver")),
                                            PropertyState_DIRECT_VALUE));
         }
     }