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

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 a44f1b9d124..03a8293ef6e 100644
--- a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
+++ b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
@@ -59,7 +59,7 @@ public class JdbcLongVarCharTest extends ComplexTestCase
 
             String url = "jdbc:mysql://localhost:3306/mysql?user=root";
             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();
@@ -117,4 +117,4 @@ public class JdbcLongVarCharTest extends ComplexTestCase
             System.exit(0);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/connectivity/registry/mysql/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/mysql/org/openoffice/Office/DataAccess/Drivers.xcu
index 77988448f72..acd8bfdaf80 100644
--- a/connectivity/registry/mysql/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/mysql/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/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index 95094265e50..c0ad7802ec5 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -54,7 +54,7 @@ namespace connectivity
             css::uno::Sequence<css::beans::PropertyValue> const & info)
         {
             return comphelper::NamedValueCollection(info).getOrDefault(
-                "JavaDriverClass", OUString("com.mysql.jdbc.Driver"));
+                "JavaDriverClass", OUString("org.mariadb.jdbc.Driver"));
         }
     }
 
@@ -185,7 +185,7 @@ namespace connectivity
                     aProps.push_back( PropertyValue(
                                           "JavaDriverClass"
                                           ,0
-                                          ,makeAny(OUString("com.mysql.jdbc.Driver"))
+                                          ,makeAny(OUString("org.mariadb.jdbc.Driver"))
                                           ,PropertyState_DIRECT_VALUE) );
                 }
             }