diff options
| author | Noel Grandin <noel@peralex.com> | 2014-05-30 13:02:20 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-05 08:27:27 +0000 |
| commit | 563da4d20d4dfb35bc45e5714b73994dda80802a (patch) | |
| tree | f1c859145d7f0c2f3162e82dfc08eac7a3922a53 /mysqlc | |
| parent | 1fc5d5fc5174d768869c84adfbda6367057e8577 (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.
Cherry-picked from 6b50e21473e7d2b24b5c609d8a1c31f27644d842
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>
Reviewed-on: https://gerrit.libreoffice.org/9642
Diffstat (limited to 'mysqlc')
| -rw-r--r-- | mysqlc/source/mysqlc_connection.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index 65bfd2e88de5..b09f322a208e 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" |