summaryrefslogtreecommitdiff
path: root/mysqlc/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-05-30 13:02:20 +0200
committerCaolán McNamara <caolanm@redhat.com>2014-05-30 08:24:31 -0500
commit6b50e21473e7d2b24b5c609d8a1c31f27644d842 (patch)
treeee171ed56b3da3e6c9507d8083fb9f07b85b6705 /mysqlc/source
parentc3c1cf88f2e6982604c885b108ff72881213f3d8 (diff)
deb#749592 mysql-connector doesn't work with remote connections
and also fdo#77584 mysql-connector doesn't work over SSH tunnel Not sure exactly how this got broken, I suspect that the UI code has started unconditionally passing down the properties, just filling them with empty spaces for the unused ones. Anyhow, this appears to fix the problem. Change-Id: I7ac2a0d6bae610f47d2a28daa9beb3ef0e2dbb52 Reviewed-on: https://gerrit.libreoffice.org/9565 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'mysqlc/source')
-rw-r--r--mysqlc/source/mysqlc_connection.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index 9c0b1831c28f..f8274f44fbb6 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -158,10 +158,10 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
OSL_VERIFY( pIter->Value >>= aPass );
} else if (pIter->Name.equalsAscii("LocalSocket")) {
OSL_VERIFY( pIter->Value >>= sUnixSocket );
- unixSocketPassed = true;
+ unixSocketPassed = !sUnixSocket.isEmpty();
} else if (pIter->Name.equalsAscii("NamedPipe")) {
OSL_VERIFY( pIter->Value >>= sNamedPipe );
- namedPipePassed = true;
+ namedPipePassed = !sNamedPipe.isEmpty();
} else if ( pIter->Name.equalsAscii("PublicConnectionURL")) {
OSL_VERIFY( pIter->Value >>= m_settings.connectionURL );
} else if ( pIter->Name.equalsAscii("NewURL")) { // legacy name for "PublicConnectionURL"