Hi,
Am 16.11.18 um 19:49 schrieb Rene Engelhard:
[...]
>>> 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) );
>>> }
>>> }
>
> But I think this will give us problems if we suggest libmariadb-java and don't get the
> new class into this...
>
> Can't we get some symlinks in libmariadb-java? :)
I'm not sure if I understand you correctly. The classname
"org.mariadb.jdbc.Driver" can't be changed because this path is
hardcoded in mariadb-java-client.jar. We could create a symlink to
mysql-connector-java.jar but that wouldn't achieve anything. So this is
a either-or situation. I can backport libmariadb-java to Stretch though,
if that helps.
Regards,
Markus
Attachment:
signature.asc
Description: OpenPGP digital signature