[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 3817add48da61fe835bd6e202d02a3b06c6f3710..ace57bd35d98c80dd8cb173eaf59189b0f4fa0dd 100644 (file)
--- 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 38be69b48a4d29c1c14f2a34b2af3e1b311c4c58..079b23413bc9e804aa7556939ee2cacf72e1cc24 100644 (file)
--- 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 bc2a2314b939b18c8cff2b03abc6da035ce5b340..27651e67322092e85cf55332c97bc0e7d94c8921 100644 (file)
--- a/connectivity/source/drivers/mysql_jdbc/YDriver.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YDriver.cxx
@@ -50,7 +50,7 @@ namespace
 OUString getJavaDriverClass(css::uno::Sequence<css::beans::PropertyValue> const& info)
 {
     return comphelper::NamedValueCollection::getOrDefault(info, u"JavaDriverClass",
-                                                          u"com.mysql.jdbc.Driver"_ustr);
+                                                          u"org.mariadb.jdbc.Driver"_ustr);
 }
 }
 
@@ -165,7 +165,7 @@ Sequence<PropertyValue> lcl_convertProperties(T_DRIVERTYPE _eType,
     {
         if (!jdc)
         {
-            aProps.emplace_back("JavaDriverClass", 0, Any(u"com.mysql.jdbc.Driver"_ustr),
+            aProps.emplace_back("JavaDriverClass", 0, Any(u"org.mariadb.jdbc.Driver"_ustr),
                                 PropertyState_DIRECT_VALUE);
         }
     }