Hi,
Ah, bad timing for my own effort when I saw the other uploads... :)
Did a commit just adding it as an alternative...
On Fri, Nov 09, 2018 at 11:13:22PM +0100, Markus Koschany wrote:
> The 0001 patch can be applied for the Debian packaging.
How is this going to help on stretch where libmysql-java is still there
and libmariadb-java doesn't exist? Or people who use it on buster/sid
and didn't install libmariadb-java?
That's why I added the alternative only in my attempt...
> be applied against the upstream sources. We have to replace the old
> MySQL driver class with the new one from MariaDB. Except for that
> libmariadb-java should just work.
Hmm.
> diff --git a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
> b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
> index a44f1b9d1..03a8293ef 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);
Not used, ttbomk. At least we have no test environment where this ever
could work. No MySQL running.
> diff --git
> a/connectivity/registry/mysql/org/openoffice/Office/DataAccess/Drivers.xcu
> b/connectivity/registry/mysql/org/openoffice/Office/DataAccess/Drivers.xcu
> index 77988448f..acd8bfdaf 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 95094265e..c0ad7802e 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) );
> }
> }
Didn't know it was there hardcoded in some places, I only knew about the
file touched by jdbc-driver-classpaths.diff
But see above.
Regards,
Rene
