diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-12-05 12:32:06 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-12-05 12:32:06 +0100 |
| commit | e694ac4193585d33512f7963e4f6069a51670646 (patch) | |
| tree | ed53020c30129298b702b1e0ae08cba60c7c4c44 /storage/connect/odbconn.cpp | |
| parent | 54d4589ddeedb69c62c02cc2846c441a49488b8c (diff) | |
| download | mariadb-git-e694ac4193585d33512f7963e4f6069a51670646.tar.gz | |
- Suppress eventual prompting when connecting to an ODBC source
modified:
storage/connect/odbconn.cpp
Diffstat (limited to 'storage/connect/odbconn.cpp')
| -rw-r--r-- | storage/connect/odbconn.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/connect/odbconn.cpp b/storage/connect/odbconn.cpp index 78731cee22c..a4a33ebe2c4 100644 --- a/storage/connect/odbconn.cpp +++ b/storage/connect/odbconn.cpp @@ -1123,10 +1123,10 @@ bool ODBConn::Connect(DWORD Options) PGLOBAL& g = m_G; PDBUSER dup = PlgGetUser(g); - if (Options & noOdbcDialog || dup->Remote) +//if (Options & noOdbcDialog || dup->Remote) wConnectOption = SQL_DRIVER_NOPROMPT; - else if (Options & forceOdbcDialog) - wConnectOption = SQL_DRIVER_PROMPT; +//else if (Options & forceOdbcDialog) +// wConnectOption = SQL_DRIVER_PROMPT; rc = SQLDriverConnect(m_hdbc, hWnd, (PUCHAR)m_Connect, SQL_NTS, ConnOut, MAX_CONNECT_LEN, |